diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-29 04:01:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-29 04:01:22 -0700 |
| commit | 87bd1b54ce195f6b3a7be3a63c8c7b1ccf78ae43 (patch) | |
| tree | c176041a0b38d10aa8cca34588beefa9aebb4e47 /include/linux | |
| parent | a2062807f2bfbc3d8a9d05b2796cde060d4cea70 (diff) | |
| parent | 0f8d253f255a6cea81f34f746322ef48f3299276 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -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 bc69e1f29b46..eed506d0196d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -734,6 +734,7 @@ #define PCI_DEVICE_ID_TI_1251B 0xac1f #define PCI_DEVICE_ID_TI_4410 0xac41 #define PCI_DEVICE_ID_TI_4451 0xac42 +#define PCI_DEVICE_ID_TI_4520 0xac46 #define PCI_DEVICE_ID_TI_1410 0xac50 #define PCI_DEVICE_ID_TI_1420 0xac51 #define PCI_DEVICE_ID_TI_1451A 0xac52 |