diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 11:00:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 11:00:55 -0500 |
| commit | b37df85960a34dd96d0a4695c650f7972ef56c30 (patch) | |
| tree | 6b096e3c01bbfd4bac062f3e013e9a43de1a8f4e /include | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| parent | 2cb4abd12bab7efd22a8b69d3b9a739500e8fee5 (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')
| -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 defdeed20641..920d21e021b6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2073,6 +2073,8 @@ | |||
| 2073 | 2073 | ||
| 2074 | #define PCI_VENDOR_ID_PASEMI 0x1959 | 2074 | #define PCI_VENDOR_ID_PASEMI 0x1959 |
| 2075 | 2075 | ||
| 2076 | #define PCI_VENDOR_ID_ATTANSIC 0x1969 | ||
| 2077 | |||
| 2076 | #define PCI_VENDOR_ID_JMICRON 0x197B | 2078 | #define PCI_VENDOR_ID_JMICRON 0x197B |
| 2077 | #define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 | 2079 | #define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 |
| 2078 | #define PCI_DEVICE_ID_JMICRON_JMB361 0x2361 | 2080 | #define PCI_DEVICE_ID_JMICRON_JMB361 0x2361 |