diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-21 22:13:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-21 22:13:55 -0700 |
| commit | fcd358935df77a25f4eff52a1ad4361c929ab1a3 (patch) | |
| tree | e13bd927ee73846befdbe1129e69c016681b65a4 /include/linux | |
| parent | fc4ace4008985cdafd3516b003b0073f99afd5e2 (diff) | |
| parent | 589a54dcb015e416aab8864f1fde41ff8e719779 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/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 bebaee7edb52..67a697940471 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1551,6 +1551,7 @@ #define PCI_VENDOR_ID_ALTIMA 0x173b #define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8 +#define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea #define PCI_VENDOR_ID_SYMPHONY 0x1c1c #define PCI_DEVICE_ID_SYMPHONY_101 0x0001 |