diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-29 13:48:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-29 13:48:48 -0400 |
| commit | e389f9aec689209724105ae80a6c91fd2e747bc9 (patch) | |
| tree | 3cc88a3e785e4f2ffeaa9dad0da695cfa437d4fe /include/linux/pci_ids.h | |
| parent | f73b0a08eae0e28c50db5dd5ab8245546918bfb6 (diff) | |
| parent | b4cf205846463a0a23a917bb18ad833bc9a8c0bb (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
smc911x: fix compilation breakage wjen debug is on
[netdrvr] eexpress: minor corrections
add NAPI support to sb1250-mac.c
ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
e1000: ROUND_UP macro cleanup in drivers/net/e1000
Generic HDLC sparse annotations
e100: Optionally use I/O mode only to access register space
e100: allow bad MAC address when running with invalid eeprom csum
ehea: fix for dlpar support
ehea: fix for sysfs entries
3C509: Remove unnecessary include of <linux/pm_legacy.h>
NetXen: Fix for vmalloc issues
NetXen: Fixes for Power PC architecture
NetXen: Port swap feature for multi port cards
NetXen: Removal of redundant macros
NetXen: Multi PCI support for Quad cards
NetXen: Removal of redundant argument passing
NetXen: Use multiple PCI functions
[netdrvr e100] experiment with doing RX in a similar manner to eepro100
[PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
...
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 5f21b0f68b42..1b0ddbb8a804 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1458,6 +1458,8 @@ | |||
| 1458 | 1458 | ||
| 1459 | #define PCI_VENDOR_ID_TOSHIBA_2 0x102f | 1459 | #define PCI_VENDOR_ID_TOSHIBA_2 0x102f |
| 1460 | #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 | 1460 | #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 |
| 1461 | #define PCI_DEVICE_ID_TOSHIBA_TC35815_NWU 0x0031 | ||
| 1462 | #define PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939 0x0032 | ||
| 1461 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE 0x0105 | 1463 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE 0x0105 |
| 1462 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 | 1464 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 |
| 1463 | #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 | 1465 | #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 |