diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /include/linux/pci_ids.h | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 07fc57429b58..8938d59013c6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2092,8 +2092,10 @@ | |||
| 2092 | #define PCI_DEVICE_ID_MPC8568 0x0021 | 2092 | #define PCI_DEVICE_ID_MPC8568 0x0021 |
| 2093 | #define PCI_DEVICE_ID_MPC8567E 0x0022 | 2093 | #define PCI_DEVICE_ID_MPC8567E 0x0022 |
| 2094 | #define PCI_DEVICE_ID_MPC8567 0x0023 | 2094 | #define PCI_DEVICE_ID_MPC8567 0x0023 |
| 2095 | #define PCI_DEVICE_ID_MPC8544E 0x0030 | 2095 | #define PCI_DEVICE_ID_MPC8533E 0x0030 |
| 2096 | #define PCI_DEVICE_ID_MPC8544 0x0031 | 2096 | #define PCI_DEVICE_ID_MPC8533 0x0031 |
| 2097 | #define PCI_DEVICE_ID_MPC8544E 0x0032 | ||
| 2098 | #define PCI_DEVICE_ID_MPC8544 0x0033 | ||
| 2097 | #define PCI_DEVICE_ID_MPC8641 0x7010 | 2099 | #define PCI_DEVICE_ID_MPC8641 0x7010 |
| 2098 | #define PCI_DEVICE_ID_MPC8641D 0x7011 | 2100 | #define PCI_DEVICE_ID_MPC8641D 0x7011 |
| 2099 | 2101 | ||