The patch titled
atl1: add L1 device id to pci_ids, then use it
has been added to the -mm tree. Its filename is
atl1-add-l1-device-id-to-pci_ids-then-use-it.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: atl1: add L1 device id to pci_ids, then use it
From: Chris Snook <csnook@xxxxxxxxxx>
Add device id for the Attansic L1 chip to pci_ids.h, then use it.
Signed-off-by: Chris Snook <csnook@xxxxxxxxxx>
Signed-off-by: Jay Cliburn <jacliburn@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/atl1/atl1_main.c | 2 +-
include/linux/pci_ids.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/net/atl1/atl1_main.c~atl1-add-l1-device-id-to-pci_ids-then-use-it drivers/net/atl1/atl1_main.c
--- a/drivers/net/atl1/atl1_main.c~atl1-add-l1-device-id-to-pci_ids-then-use-it
+++ a/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 -puN include/linux/pci_ids.h~atl1-add-l1-device-id-to-pci_ids-then-use-it include/linux/pci_ids.h
--- a/include/linux/pci_ids.h~atl1-add-l1-device-id-to-pci_ids-then-use-it
+++ a/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
_
Patches currently in -mm which might be from csnook@xxxxxxxxxx are
atl1-drop-net_pci-from-kconfig.patch
atl1-read-mac-address-from-register.patch
atl1-remove-unused-define.patch
atl1-add-l1-device-id-to-pci_ids-then-use-it.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
