summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-01-03 09:55:30 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-01-24 22:39:53 +0100
commit4d6dc7fdef2971f8158cd05f3d1b44f9ddc437e3 (patch)
tree38c7f1e0d9b7251b78a3d259a204ae82c6458384 /arch/mips
parente7277e1dcc8c332a1d69f4c585e593bcbc9c5970 (diff)
downloadlinux-stable-4d6dc7fdef2971f8158cd05f3d1b44f9ddc437e3.tar.gz
linux-stable-4d6dc7fdef2971f8158cd05f3d1b44f9ddc437e3.tar.bz2
linux-stable-4d6dc7fdef2971f8158cd05f3d1b44f9ddc437e3.zip
MIPS: BCM47XX: Enable buttons support on SSB
This is supported since implementing IRQ domain in ssb. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6315/
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/bcm47xx/buttons.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 51815bae3633..872c62e93e0e 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -3,7 +3,6 @@
#include <linux/input.h>
#include <linux/gpio_keys.h>
#include <linux/interrupt.h>
-#include <linux/ssb/ssb_embedded.h>
#include <bcm47xx_board.h>
#include <bcm47xx.h>
@@ -359,13 +358,6 @@ int __init bcm47xx_buttons_register(void)
enum bcm47xx_board board = bcm47xx_board_get();
int err;
-#ifdef CONFIG_BCM47XX_SSB
- if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_SSB) {
- pr_debug("Buttons on SSB are not supported yet.\n");
- return -ENOTSUPP;
- }
-#endif
-
switch (board) {
case BCM47XX_BOARD_ASUS_RTN12:
err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);