diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
| commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
| tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /drivers/bcma/bcma_private.h | |
| parent | cxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor (diff) | |
| parent | Linux 3.8-rc7 (diff) | |
| download | linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.xz linux-fd5023111cf720db890ef34f305ac5d427e690a0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bcma/bcma_private.h')
| -rw-r--r-- | drivers/bcma/bcma_private.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index 6f377bd1a6d6..79595a001204 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -97,11 +97,16 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); #ifdef CONFIG_BCMA_DRIVER_GPIO /* driver_gpio.c */ int bcma_gpio_init(struct bcma_drv_cc *cc); +int bcma_gpio_unregister(struct bcma_drv_cc *cc); #else static inline int bcma_gpio_init(struct bcma_drv_cc *cc) { return -ENOTSUPP; } +static inline int bcma_gpio_unregister(struct bcma_drv_cc *cc) +{ + return 0; +} #endif /* CONFIG_BCMA_DRIVER_GPIO */ #endif |