diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:02:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:02:05 +0200 |
| commit | 6e429101849416551150dad451f7e8625317ae09 (patch) | |
| tree | 8b677b7b56e0f8ede9e8c11368b1dc6c666dd2e6 /drivers/net/atl1e/atl1e_main.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6 (diff) | |
| parent | 3c509: Add missing EISA IDs (diff) | |
| download | linux-6e429101849416551150dad451f7e8625317ae09.tar.xz linux-6e429101849416551150dad451f7e8625317ae09.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
3c509: Add missing EISA IDs
MAINTAINERS: take maintainership of the cpmac Ethernet driver
net/firmare: Ignore .cis files
ath1e: add new device id for asus hardware
mlx4_en: Fix a kernel panic when waking tx queue
rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
mac8390: fix build with NET_POLL_CONTROLLER
cxgb3: link fault fixes
cxgb3: fix dma mapping regression
netfilter: nfnetlink_log: fix wrong skbuff size calculation
netfilter: xt_hashlimit does a wrong SEQ_SKIP
bfin_mac: fix build error due to net_device_ops convert
atlx: move modinfo data from atlx.h to atl1.c
gianfar: fix babbling rx error event bug
cls_cgroup: read classid atomically in classifier
netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
netfilter: nf_ct_tcp: fix accepting invalid RST segments
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
| -rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index fb57b750866b..1342418fb209 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c @@ -37,6 +37,7 @@ char atl1e_driver_version[] = DRV_VERSION; */ static struct pci_device_id atl1e_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)}, + {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)}, /* required last entry */ { 0 } }; |