diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-05-19 01:46:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-05-19 01:46:52 -0700 |
| commit | 2864cffb53ce36f05a3a5b91f11c8d81a6c37267 (patch) | |
| tree | c34ccfe9cd21e2602cba33980c5636fafcf1fb95 /include/linux | |
| parent | d7b7a72d6835c797d8c9828eb9d2cb64af204136 (diff) | |
| parent | 7a503879523f838d0dfcab9a35a0fd7a78d188b2 (diff) | |
Merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index f1c35de71add..8642e85a7ef2 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@ -245,7 +245,7 @@ #define I2C_HW_SMBUS_SIS5595 0x06 #define I2C_HW_SMBUS_ALI1535 0x07 #define I2C_HW_SMBUS_SIS630 0x08 -#define I2C_HW_SMBUS_SIS645 0x09 +#define I2C_HW_SMBUS_SIS96X 0x09 #define I2C_HW_SMBUS_AMD8111 0x0a #define I2C_HW_SMBUS_SCX200 0x0b #define I2C_HW_SMBUS_NFORCE2 0x0c diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 996e9d1a9e3d..f300bfb4f37f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -569,6 +569,9 @@ #define PCI_DEVICE_ID_SI_751 0x0751 #define PCI_DEVICE_ID_SI_752 0x0752 #define PCI_DEVICE_ID_SI_900 0x0900 +#define PCI_DEVICE_ID_SI_961 0x0961 +#define PCI_DEVICE_ID_SI_962 0x0962 +#define PCI_DEVICE_ID_SI_963 0x0963 #define PCI_DEVICE_ID_SI_5107 0x5107 #define PCI_DEVICE_ID_SI_5300 0x5300 #define PCI_DEVICE_ID_SI_5511 0x5511 |