diff --git a/[refs] b/[refs] index f495f043d72d..62408e604089 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bac6cd182916d95b8ffce4cd20cfa1e885c1ea42 +refs/heads/master: 1fa511ad650c30e5e98f336732f003835af57cac diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index 38455983728c..00f4df49bc0e 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -102,6 +102,7 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = { .subdevice = PCI_ANY_ID, .driver_data = 0, }, +#if 0 { .vendor = PCI_VENDOR_ID_BELKIN, .device = 0x6001, @@ -130,6 +131,7 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = { .subdevice = PCI_ANY_ID, .driver_data = 4, }, +#endif { .vendor = 0, .device = 0,