diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-13 12:09:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-13 12:09:36 -0500 |
| commit | 9418d5dc9ba40b88737580457bf3b7c63c60ec43 (patch) | |
| tree | 764c82c8cfeea907b06514d9ccfb599fb4d49cae /include | |
| parent | 31083eba370fbc5d544ac2fe67ca549c0aa2bdf7 (diff) | |
| parent | 59a030a9b7a1bab5bdae57d469583e611759e90b (diff) | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (i5k_amb) Convert macros to C functions
hwmon: (w83781d) Add missing curly braces
hwmon: (abituguru3) Identify ABit IP35 Pro as such
hwmon: (f75375s) pwmX_mode sysfs files writable for f75375 variant
hwmon: (f75375s) On n2100 systems, set fans to full speed on boot
hwmon: (f75375s) Allow setting up fans with platform_data
hwmon: (f75375s) Add new style bindings
hwmon: (lm70) Convert semaphore to mutex
hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core
hwmon: (abituguru3) Add support for 2 new motherboards
hwmon: (ibmpex) Change printk to dev_{info,err} macros
hwmon: (i5k_amb) New memory temperature sensor driver
hwmon: (f75375s) fix pwm mode setting
hwmon: (ibmpex.c) fix NULL dereference
hwmon: (sis5595) Split sis5595_attributes_opt
hwmon: (sis5595) Add individual alarm files
hwmon: (w83627hf) push nr+1 offset into *_REG_FAN macros and simplify
hwmon: (w83627hf) hoist nr-1 offset out of show-store-temp-X
hwmon: Add power meter spec to Documentation/hwmon/sysfs-interface
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/f75375s.h | 21 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/include/linux/f75375s.h b/include/linux/f75375s.h new file mode 100644 index 000000000000..e99e22500668 --- /dev/null +++ b/include/linux/f75375s.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /* | ||
| 2 | * f75375s.h - platform data structure for f75375s sensor | ||
| 3 | * | ||
| 4 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 5 | * License. See the file "COPYING" in the main directory of this archive | ||
| 6 | * for more details. | ||
| 7 | * | ||
| 8 | * Copyright (C) 2007, Riku Voipio <riku.voipio@iki.fi> | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __LINUX_F75375S_H | ||
| 12 | #define __LINUX_F75375S_H | ||
| 13 | |||
| 14 | /* We want to set fans spinning on systems where there is no | ||
| 15 | * BIOS to do that for us */ | ||
| 16 | struct f75375s_platform_data { | ||
| 17 | u8 pwm[2]; | ||
| 18 | u8 pwm_enable[2]; | ||
| 19 | }; | ||
| 20 | |||
| 21 | #endif /* __LINUX_F75375S_H */ | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index fbe19648bf91..cd6cdb3cd7a5 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2276,6 +2276,9 @@ | |||
| 2276 | #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 | 2276 | #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 |
| 2277 | #define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 | 2277 | #define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 |
| 2278 | #define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 | 2278 | #define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 |
| 2279 | #define PCI_DEVICE_ID_INTEL_5000_ERR 0x25F0 | ||
| 2280 | #define PCI_DEVICE_ID_INTEL_5000_FBD0 0x25F5 | ||
| 2281 | #define PCI_DEVICE_ID_INTEL_5000_FBD1 0x25F6 | ||
| 2279 | #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 | 2282 | #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 |
| 2280 | #define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772 | 2283 | #define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772 |
| 2281 | #define PCI_DEVICE_ID_INTEL_3000_HB 0x2778 | 2284 | #define PCI_DEVICE_ID_INTEL_3000_HB 0x2778 |