summaryrefslogtreecommitdiffstats
path: root/drivers/ssb/main.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-08 19:16:17 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-02-08 19:16:17 +0100
commitf5237f278f30a92401539a54f87ee0c717b6f818 (patch)
tree209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /drivers/ssb/main.c
parentMerge branch 'tg3' (diff)
parentrtlwifi: rtl8723ae: Fix W=1 compile warnings (diff)
downloadlinux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.xz
linux-f5237f278f30a92401539a54f87ee0c717b6f818.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/ssb/main.c')
-rw-r--r--drivers/ssb/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 772ad9b5c304..9987d9f366f4 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -540,6 +540,14 @@ static int ssb_devices_register(struct ssb_bus *bus)
dev_idx++;
}
+#ifdef CONFIG_SSB_DRIVER_MIPS
+ if (bus->mipscore.pflash.present) {
+ err = platform_device_register(&ssb_pflash_dev);
+ if (err)
+ pr_err("Error registering parallel flash\n");
+ }
+#endif
+
return 0;
error:
/* Unwind the already registered devices. */