diff --git a/[refs] b/[refs] index f04d49f34497..5ddd19dc6b8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76e8cd248fe5cdff6bfb2bda970df5bcda3604c2 +refs/heads/master: cf3d3d38e7b42b75689fe895d09f197922c109c5 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c index f1248fb2e4a0..be0293d1d8d0 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_core.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c @@ -92,11 +92,7 @@ u32 rt_global_debug_component = \ // COMP_POWER_TRACKING | // COMP_INTR | COMP_ERR ; //always open err flags on -#ifndef PCI_DEVICE -#define PCI_DEVICE(vend,dev)\ - .vendor=(vend),.device=(dev),\ - .subvendor=PCI_ANY_ID,.subdevice=PCI_ANY_ID -#endif + static const struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = { #ifdef RTL8190P /* Realtek */