diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-08-10 15:23:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:05:52 -0400 |
commit | d57ef3a6a2eeb88df47e892c66692e3f59722ffe (patch) | |
tree | db2f260a55ce24cfed110cb6281674a5fbcb0a86 /drivers/bcma/main.c | |
parent | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (diff) |
bcma: detect and register serial flash device
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/main.c')
-rw-r--r-- | drivers/bcma/main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 758af9ccdef0..a501d259287c 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | #include "bcma_private.h" | 8 | #include "bcma_private.h" |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/platform_device.h> | ||
10 | #include <linux/bcma/bcma.h> | 11 | #include <linux/bcma/bcma.h> |
11 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
12 | 13 | ||
@@ -136,6 +137,14 @@ static int bcma_register_cores(struct bcma_bus *bus) | |||
136 | dev_id++; | 137 | dev_id++; |
137 | } | 138 | } |
138 | 139 | ||
140 | #ifdef CONFIG_BCMA_SFLASH | ||
141 | if (bus->drv_cc.sflash.present) { | ||
142 | err = platform_device_register(&bcma_sflash_dev); | ||
143 | if (err) | ||
144 | bcma_err(bus, "Error registering serial flash\n"); | ||
145 | } | ||
146 | #endif | ||
147 | |||
139 | return 0; | 148 | return 0; |
140 | } | 149 | } |
141 | 150 | ||