mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
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.
This commit is contained in:
commit
b37df85960
14 changed files with 5211 additions and 110 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue