Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[safe/jmp/linux-2.6] / drivers / net / dl2k.h

diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index d66c605..7caab3d 100644 (file)
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -388,8 +388,8 @@ enum _mii_mssr {
        MII_MSSR_CFG_RES = 0x4000,
        MII_MSSR_LOCAL_RCV_STATUS = 0x2000,
        MII_MSSR_REMOTE_RCVR = 0x1000,
-       MII_MSSR_LP_1000BT_HD = 0x0800,
-       MII_MSSR_LP_1000BT_FD = 0x0400,
+       MII_MSSR_LP_1000BT_FD = 0x0800,
+       MII_MSSR_LP_1000BT_HD = 0x0400,
        MII_MSSR_IDLE_ERR_COUNT = 0x00ff,
 };
 
@@ -537,7 +537,7 @@ struct netdev_private {
         driver_data             Data private to the driver.
 */
 
-static const struct pci_device_id rio_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(rio_pci_tbl) = {
        {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },
        {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, },
        { }