The patch titled
8139cp: use PCI_DEVICE() to shorten the PCI device table
has been added to the -mm tree. Its filename is
8139cp-use-pci_device-to-shorten-the-pci-device-table.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: 8139cp: use PCI_DEVICE() to shorten the PCI device table
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/8139cp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/net/8139cp.c~8139cp-use-pci_device-to-shorten-the-pci-device-table drivers/net/8139cp.c
--- a/drivers/net/8139cp.c~8139cp-use-pci_device-to-shorten-the-pci-device-table
+++ a/drivers/net/8139cp.c
@@ -406,10 +406,8 @@ static int cp_set_eeprom(struct net_devi
struct ethtool_eeprom *eeprom, u8 *data);
static struct pci_device_id cp_pci_tbl[] = {
- { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
- { PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+ { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
+ { PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },
{ },
};
MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
_
Patches currently in -mm which might be from romieu@xxxxxxxxxxxxx are
8139cp-trim-ring_info.patch
8139cp-remove-gratuitous-indirection.patch
8139cp-ring_info-removal-for-the-receive-path.patch
8139cp-sync-the-device-private-data-with-its-r8169-counterpart.patch
8139cp-removal-of-useless-bug_on-check.patch
8139cp-pci_get_drvdatapdev-can-not-be-null-in-suspend-handler.patch
8139cp-use-pci_device-to-shorten-the-pci-device-table.patch
git-r8169.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
