summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-22 20:18:02 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-22 20:18:02 -0400
commit78cc3b78c4208d28e7f4ecded82e238224ed4d1c (patch)
tree137f4fe32e41572bb41ba170f6b822ebf215079e
parentff2a2e0172fd11b1bfb9b45ee1b996d3f10669af (diff)
parentd81bf551103cc3bc9e4f7ddf337511d6da0d088f (diff)
downloadop-kernel-dev-78cc3b78c4208d28e7f4ecded82e238224ed4d1c.zip
op-kernel-dev-78cc3b78c4208d28e7f4ecded82e238224ed4d1c.tar.gz
Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp
-rw-r--r--drivers/net/r8169.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c3015d6..7ac5994 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -210,7 +210,7 @@ static const struct {
static struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 },
- { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_1 },
+ { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
OpenPOWER on IntegriCloud