diff options
| author | Mark Brown <broonie@kernel.org> | 2016-11-04 12:16:38 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-04 12:16:38 -0600 |
| commit | cc9b94029e9ef51787af908e9856b1eed314bc00 (patch) | |
| tree | 9675310b89d0f6fb1f7bd9423f0638c4ee5226fd /arch/nios2/platform/platform.c | |
| parent | 13bed58ce8748d430a26e353a09b89f9d613a71f (diff) | |
| parent | 1b5b42216469b05ef4b5916cb40b127dfab1da88 (diff) | |
| download | talos-op-linux-cc9b94029e9ef51787af908e9856b1eed314bc00.tar.gz talos-op-linux-cc9b94029e9ef51787af908e9856b1eed314bc00.zip | |
Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed
Diffstat (limited to 'arch/nios2/platform/platform.c')
| -rw-r--r-- | arch/nios2/platform/platform.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/nios2/platform/platform.c b/arch/nios2/platform/platform.c index d478773f758a..2a35154ca153 100644 --- a/arch/nios2/platform/platform.c +++ b/arch/nios2/platform/platform.c @@ -9,7 +9,6 @@ */ #include <linux/init.h> -#include <linux/of_platform.h> #include <linux/of_address.h> #include <linux/of_fdt.h> #include <linux/err.h> @@ -39,8 +38,7 @@ static int __init nios2_soc_device_init(void) } } - return of_platform_populate(NULL, of_default_bus_match_table, - NULL, NULL); + return 0; } device_initcall(nios2_soc_device_init); |
