From f8487aa85b0f3c092bb3c1f27972b445a1944048 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 13 Feb 2014 21:20:57 +0100 Subject: ARM: integrator: merge platform.h to hardware.h There is no need to have the two separate headers and , 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 Cc: Jonathan Austin Cc: Russell King Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/leds.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-integrator/leds.c') diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c index cb6ac58f5e07..e2b1b3a4c5d3 100644 --- a/arch/arm/mach-integrator/leds.c +++ b/arch/arm/mach-integrator/leds.c @@ -12,7 +12,6 @@ #include #include -#include #include "cm.h" -- cgit v1.2.3 From 1b1ef755bd910106fef15bd55386b60e88d73e16 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 13 Feb 2014 21:26:24 +0100 Subject: ARM: integrator: localize the hardware.h header As we move toward multiplatform support for the Integrator family we need to localize all headers. This moves the hardware.h header down to the machine folder. There are no users outside the machine in the kernel. Cc: Will Deacon Cc: Jonathan Austin Cc: Russell King Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/leds.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-integrator/leds.c') diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c index e2b1b3a4c5d3..f1dcb57a59e2 100644 --- a/arch/arm/mach-integrator/leds.c +++ b/arch/arm/mach-integrator/leds.c @@ -11,8 +11,7 @@ #include #include -#include - +#include "hardware.h" #include "cm.h" #if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS) -- cgit v1.2.3