diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
| commit | f5237f278f30a92401539a54f87ee0c717b6f818 (patch) | |
| tree | 209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /drivers/ssb/main.c | |
| parent | b285109dde7b873b5dc671ef1b3ae3090f4bc72f (diff) | |
| parent | b26f5f09ebdeb85ab152344cc1d6d484a3ce967d (diff) | |
| download | linux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.gz linux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.bz2 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.c | 8 |
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. */ |