diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-20 23:01:26 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-07-12 11:24:08 +0200 |
| commit | cd1dc431d02afda521bed53b7c87a678a3ac246f (patch) | |
| tree | 0e08a9208cfb554de41d3781ef4c9669b004fc39 /arch/arm/mach-ux500/setup.h | |
| parent | 4cf124f9a9d0d3505b6335d6061da54f83125b8e (diff) | |
ARM: ux500: consolidate soc_device code in id.c
Nothing else uses the global dbx500_asic_id structure, so
we can merge the two small files that reference it into one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/setup.h')
| -rw-r--r-- | arch/arm/mach-ux500/setup.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h index 8b44b646b191..1e9e7c55df75 100644 --- a/arch/arm/mach-ux500/setup.h +++ b/arch/arm/mach-ux500/setup.h @@ -19,11 +19,9 @@ void ux500_l2x0_init(void); void ux500_restart(enum reboot_mode mode, const char *cmd); -void __init ux500_setup_id(void); - extern void __init ux500_init_irq(void); -extern struct device *ux500_soc_device_init(const char *soc_id); +extern struct device *ux500_soc_device_init(void); extern void ux500_cpu_die(unsigned int cpu); |