From c098b676b635c3426425c60a96f4c09fa293273f Mon Sep 17 00:00:00 2001 From: Chris Snook Date: Wed, 14 Feb 2007 20:17:01 -0600 Subject: [PATCH] --- yaml --- r: 49027 b: refs/heads/master c: e81e557a8f1e22fab1b1bdc649ac0d24017ddce2 h: refs/heads/master i: 49025: af020b5a08c2f6e7a34e08a7c638b7d9ed4adf32 49023: bd37e83bd92afd2a29c228a03efaadb6b227a0d0 v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1/atl1_main.c | 2 +- trunk/include/linux/pci_ids.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dff947c2a421..e2982d818545 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1e5a1a00d3991eabda41dde69d1905cad4980a0 +refs/heads/master: e81e557a8f1e22fab1b1bdc649ac0d24017ddce2 diff --git a/trunk/drivers/net/atl1/atl1_main.c b/trunk/drivers/net/atl1/atl1_main.c index abce97e96b3d..09f337563177 100644 --- a/trunk/drivers/net/atl1/atl1_main.c +++ b/trunk/drivers/net/atl1/atl1_main.c @@ -99,7 +99,7 @@ MODULE_VERSION(DRIVER_VERSION); * atl1_pci_tbl - PCI Device ID Table */ static const struct pci_device_id atl1_pci_tbl[] = { - {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1048)}, + {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)}, /* required last entry */ {0,} }; diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 182a96f77c84..600308fdf9ce 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2089,6 +2089,7 @@ #define PCI_VENDOR_ID_PASEMI 0x1959 #define PCI_VENDOR_ID_ATTANSIC 0x1969 +#define PCI_DEVICE_ID_ATTANSIC_L1 0x1048 #define PCI_VENDOR_ID_JMICRON 0x197B #define PCI_DEVICE_ID_JMICRON_JMB360 0x2360