aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-07 22:21:56 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-07 22:21:56 -0500
commit7677ced48e2bbbb8d847d34f37e5d96d2b0e41e4 (patch)
tree0a859f403c02eb854d9ffa11bd17f77056891d07 /include
parent21d37bbc65e39a26856de6b14be371ff24e0d03f (diff)
parentac38dfc39e7684f55174742e5f0d6c5a0093bbf6 (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: (116 commits) sk98lin: planned removal AT91: MACB support sky2: version 1.12 sky2: add new chip ids sky2: Yukon Extreme support sky2: safer transmit timeout sky2: TSO support for EC_U sky2: use dev_err for error reports sky2: add Wake On Lan support fix unaligned exception in /drivers/net/wireless/orinoco.c Remove unused kernel config option DLCI_COUNT z85230: spinlock logic mips: declance: Driver model for the PMAD-A Spidernet: Rework RX linked list NET: turn local_save_flags() + local_irq_disable() into local_irq_save() NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save() hp100: convert pci_module_init() to pci_register_driver() NetXen: Added ethtool support for user level tools. NetXen: Firmware crb init changes. maintainers: add atl1 maintainers ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ccd706f876ec..5b4f1e3caf5d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2070,6 +2070,8 @@
2070#define PCI_VENDOR_ID_TDI 0x192E 2070#define PCI_VENDOR_ID_TDI 0x192E
2071#define PCI_DEVICE_ID_TDI_EHCI 0x0101 2071#define PCI_DEVICE_ID_TDI_EHCI 0x0101
2072 2072
2073#define PCI_VENDOR_ID_PASEMI 0x1959
2074
2073#define PCI_VENDOR_ID_JMICRON 0x197B 2075#define PCI_VENDOR_ID_JMICRON 0x197B
2074#define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 2076#define PCI_DEVICE_ID_JMICRON_JMB360 0x2360
2075#define PCI_DEVICE_ID_JMICRON_JMB361 0x2361 2077#define PCI_DEVICE_ID_JMICRON_JMB361 0x2361