diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
| commit | ab1f5a532c9d33b49b039660c5ecbc0ab53e7133 (patch) | |
| tree | a1c1d820f2280535978632c5935462efcf5a4c7f /drivers/bcma/main.c | |
| parent | f48ecb19bc0443a4272dd0934e7bee4480610df9 (diff) | |
| parent | 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9 (diff) | |
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/bcma/main.c')
| -rw-r--r-- | drivers/bcma/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 122086ef9fe1..534e1337766d 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c | |||
| @@ -133,7 +133,7 @@ static bool bcma_is_core_needed_early(u16 core_id) | |||
| 133 | return false; | 133 | return false; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | #ifdef CONFIG_OF | 136 | #if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS) |
| 137 | static struct device_node *bcma_of_find_child_device(struct platform_device *parent, | 137 | static struct device_node *bcma_of_find_child_device(struct platform_device *parent, |
| 138 | struct bcma_device *core) | 138 | struct bcma_device *core) |
| 139 | { | 139 | { |