diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
commit | 77e442461c74068217b59b356cf18992c78ed896 (patch) | |
tree | 70f62a16bc6a81b63768279c9b40645d8f4dd4ff /include/linux/pci_ids.h | |
parent | d54191b85e294c46f05a2249b1f55ae54930bcc7 (diff) | |
parent | 45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff) |
Merge branch 'linus' into x86/kprobes
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 65953822c9c..1cf4084b51e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2171,6 +2171,8 @@ #define PCI_DEVICE_ID_MPC8544 0x0033 #define PCI_DEVICE_ID_MPC8572E 0x0040 #define PCI_DEVICE_ID_MPC8572 0x0041 +#define PCI_DEVICE_ID_MPC8536E 0x0050 +#define PCI_DEVICE_ID_MPC8536 0x0051 #define PCI_DEVICE_ID_MPC8641 0x7010 #define PCI_DEVICE_ID_MPC8641D 0x7011 #define PCI_DEVICE_ID_MPC8610 0x7018 |