summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/core.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-02-13 21:20:57 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-02-26 13:49:06 +0100
commitf8487aa85b0f3c092bb3c1f27972b445a1944048 (patch)
tree66ec745761a84a3bec58df046f66ebdba5b50451 /arch/arm/mach-integrator/core.c
parentcc0cc4ca093f3df9e554af8dae39a126987bccf7 (diff)
downloadblackbird-obmc-linux-f8487aa85b0f3c092bb3c1f27972b445a1944048.tar.gz
blackbird-obmc-linux-f8487aa85b0f3c092bb3c1f27972b445a1944048.zip
ARM: integrator: merge platform.h to hardware.h
There is no need to have the two separate headers <mach/platform.h> and <mach/hardware.h>, especially since we are now going to make them local files. There is not one single driver outside the mach-integrator folder referencing any of the files. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
-rw-r--r--arch/arm/mach-integrator/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 00ddf20ed91b..7a330f541a9d 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -26,7 +26,6 @@
#include <linux/of_address.h>
#include <mach/hardware.h>
-#include <mach/platform.h>
#include <asm/mach-types.h>
#include <asm/mach/time.h>
OpenPOWER on IntegriCloud