diff options
| author | viresh kumar <viresh.kumar@st.com> | 2011-03-07 05:57:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-09 09:49:45 +0000 |
| commit | 410782beba6aa75744881810ec0cdff4c66ca777 (patch) | |
| tree | 337c3a4c7e14d02968c809e85fcf164b3e32e4c5 /arch/arm/mach-spear3xx | |
| parent | 4b9502e167d8370c2c5ee0cb20ab081bbebfffa8 (diff) | |
ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
Order of inclusion of .h files must be: <linux/...>, <asm/...>, <plat/...>,
<mach/...>. This patch corrects this ordering whereever it is not followed.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx')
| -rw-r--r-- | arch/arm/mach-spear3xx/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/entry-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-spear3xx/clock.c b/arch/arm/mach-spear3xx/clock.c index 8ae4ad0326a..5bfeb6f8bcc 100644 --- a/arch/arm/mach-spear3xx/clock.c +++ b/arch/arm/mach-spear3xx/clock.c @@ -13,8 +13,8 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <mach/misc_regs.h> #include <plat/clock.h> +#include <mach/misc_regs.h> /* root clks */ /* 32 KHz oscillator clock */ diff --git a/arch/arm/mach-spear3xx/include/mach/entry-macro.S b/arch/arm/mach-spear3xx/include/mach/entry-macro.S index 947625d6b48..e8e7dc05430 100644 --- a/arch/arm/mach-spear3xx/include/mach/entry-macro.S +++ b/arch/arm/mach-spear3xx/include/mach/entry-macro.S @@ -11,9 +11,9 @@ * warranty of any kind, whether express or implied. */ +#include <asm/hardware/vic.h> #include <mach/hardware.h> #include <mach/spear.h> -#include <asm/hardware/vic.h> .macro disable_fiq .endm diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index e7d2de84e9a..aaaa04620d2 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -14,11 +14,11 @@ #ifndef __MACH_GENERIC_H #define __MACH_GENERIC_H -#include <asm/mach/time.h> -#include <asm/mach/map.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/amba/bus.h> +#include <asm/mach/time.h> +#include <asm/mach/map.h> #include <plat/padmux.h> /* spear3xx declarations */ diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index 7e01677e2fc..80ca04a8049 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c @@ -15,9 +15,9 @@ #include <linux/amba/pl061.h> #include <linux/ptrace.h> #include <asm/irq.h> +#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> -#include <plat/shirq.h> /* pad multiplexing support */ /* muxing registers */ diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index f38eb2146e2..ca1109db555 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c @@ -13,9 +13,9 @@ #include <linux/ptrace.h> #include <asm/irq.h> +#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> -#include <plat/shirq.h> /* pad multiplexing support */ /* muxing registers */ diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index 456bb331340..ceb04e813f2 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c @@ -13,9 +13,9 @@ #include <linux/ptrace.h> #include <asm/irq.h> +#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> -#include <plat/shirq.h> /* pad multiplexing support */ /* muxing registers */ |