diff --git a/[refs] b/[refs] index fa89df127b9a..d2dbd8ea4ded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c62add38420029de50d1e4c16795211d748dd08b +refs/heads/master: 517b12f2a0d9f9e6de680b30242ec6432d2af7f7 diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h index 4986b3b8a540..190bdee065ab 100644 --- a/trunk/drivers/staging/brcm80211/include/linuxver.h +++ b/trunk/drivers/staging/brcm80211/include/linuxver.h @@ -63,10 +63,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs); #define PCI_SAVE_STATE(a, b) pci_save_state(a) #define PCI_RESTORE_STATE(a, b) pci_restore_state(a) -#ifndef HAVE_FREE_NETDEV -#define free_netdev(dev) kfree(dev) -#endif - /* suspend args */ #define DRV_SUSPEND_STATE_TYPE pm_message_t