aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 08:00:55 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 08:00:55 -0800
commitb37df85960a34dd96d0a4695c650f7972ef56c30 (patch)
tree6b096e3c01bbfd4bac062f3e013e9a43de1a8f4e /include/linux
parent5986a2ec35836a878350c54af4bd91b1de6abc59 (diff)
parent2cb4abd12bab7efd22a8b69d3b9a739500e8fee5 (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: MAINTAINERS: update DMFE and wireless drivers mailing list ucc_geth: Add support to local-mac-address property ucc_geth: Remove obsolete workaround of link speed change cxgb3: sysfs attributes in -mm tree Add Attansic L1 ethernet driver.
Diffstat (limited to 'include/linux')
-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 defdeed2064..920d21e021b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2073,6 +2073,8 @@
#define PCI_VENDOR_ID_PASEMI 0x1959
+#define PCI_VENDOR_ID_ATTANSIC 0x1969
+
#define PCI_VENDOR_ID_JMICRON 0x197B
#define PCI_DEVICE_ID_JMICRON_JMB360 0x2360
#define PCI_DEVICE_ID_JMICRON_JMB361 0x2361