diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 18:51:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 18:51:32 -0500 |
| commit | b6585dedac232ca79fe978d97a95fdaa6da24f66 (patch) | |
| tree | 4d2d78300bb9bcfb40cb35450f78dd3af82c78d3 /include/linux/pci_ids.h | |
| parent | a3ea9b584ed2acdeae817f0dc91a5880e0828a05 (diff) | |
| parent | ded2b66615613093eeb83b81499bc270de8fc499 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (36 commits)
[PATCH] hwmon: add required idr locking
[PATCH] I2C: hwmon: Rename register parameters
[PATCH] I2C: Drop unneeded i2c-dev.h includes
[PATCH] I2C: i2c-ixp4xx: Add hwmon class
[PATCH] I2C: i2c-piix4: Add Broadcom HT-1000 support
[PATCH] I2C: i2c-amd756-s4882: Improve static mutex initialization
[PATCH] I2C: i2c-ali1535: Drop redundant mutex
[PATCH] i2c: Cleanup isp1301_omap
[PATCH] i2c: Fix i2c-ite name initialization
[PATCH] i2c: Drop the i2c-frodo bus driver
[PATCH] i2c: Optimize core_lists mutex usage
[PATCH] w83781d: Don't reset the chip by default
[PATCH] w83781d: Document the alarm and beep bits
[PATCH] w83627ehf: Refactor the sysfs interface
[PATCH] hwmon: Support the Pentium M VID code
[PATCH] hwmon: Add support for the Winbond W83687THF
[PATCH] hwmon: f71805f semaphore to mutex conversions
[PATCH] hwmon: Semaphore to mutex conversions
[PATCH] i2c: Semaphore to mutex conversions, part 3
[PATCH] i2c: Semaphore to mutex conversions, part 2
...
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 989a9d00dec1..f3dcf89d5232 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1371,6 +1371,7 @@ | |||
| 1371 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 | 1371 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 |
| 1372 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 | 1372 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 |
| 1373 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 | 1373 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 |
| 1374 | #define PCI_DEVICE_ID_SERVERWORKS_HT1000SB 0x0205 | ||
| 1374 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211 | 1375 | #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211 |
| 1375 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212 | 1376 | #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212 |
| 1376 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 | 1377 | #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 |