diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
commit | b3b66ae4c8aff0636521034d824b8953dc617335 (patch) | |
tree | 0a4c792efd730a59adc79d0d2476e0a4b3aa2f2e /drivers/bcma/bcma_private.h | |
parent | bf414b369f158bb527f9f29174ada815f961b44c (diff) | |
parent | 7b2385b95363c9ff49801c19cba2489a05bd6672 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 19e3fbfd5757..cb0c45488572 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -94,11 +94,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 |