summaryrefslogtreecommitdiffstats
path: root/drivers/bcma/driver_gpio.c
diff options
context:
space:
mode:
authorDavid S. Miller2013-02-09 00:02:14 +0100
committerDavid S. Miller2013-02-09 00:02:14 +0100
commitfd5023111cf720db890ef34f305ac5d427e690a0 (patch)
tree4d21e9a02bfbdafe5fc598af0755db791238dbe7 /drivers/bcma/driver_gpio.c
parentcxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor (diff)
parentLinux 3.8-rc7 (diff)
downloadkernel-qcow2-linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.gz
kernel-qcow2-linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.xz
kernel-qcow2-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/driver_gpio.c')
-rw-r--r--drivers/bcma/driver_gpio.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index 0b5df538dfd9..45f0996a3752 100644
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -107,3 +107,8 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
return gpiochip_add(chip);
}
+
+int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+{
+ return gpiochip_remove(&cc->gpio);
+}