ARM: ux500: consolidate soc_device code in id.c
authorArnd Bergmann <arnd@arndb.de>
Mon, 20 Jun 2016 21:01:26 +0000 (23:01 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 12 Jul 2016 09:24:08 +0000 (11:24 +0200)
commitcd1dc431d02afda521bed53b7c87a678a3ac246f
tree0e08a9208cfb554de41d3781ef4c9669b004fc39
parent4cf124f9a9d0d3505b6335d6061da54f83125b8e
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>
arch/arm/mach-ux500/cache-l2x0.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/id.c
arch/arm/mach-ux500/id.h [deleted file]
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/setup.h