openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
viresh kumar 2011-03-07 05:57:01 +01:00 committed by Russell King
parent 4b9502e167
commit 410782beba
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-spear3xx/clock.c
View File

@ -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 */

2
arch/arm/mach-spear3xx/include/mach/entry-macro.S
View File

@ -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

4
arch/arm/mach-spear3xx/include/mach/generic.h
View File

@ -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 */

2
arch/arm/mach-spear3xx/spear300.c
View File

@ -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 */

2
arch/arm/mach-spear3xx/spear310.c
View File

@ -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 */

2
arch/arm/mach-spear3xx/spear320.c
View File

@ -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 */

2
arch/arm/mach-spear6xx/clock.c
View File

@ -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 */

2
arch/arm/mach-spear6xx/include/mach/entry-macro.S
View File

@ -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

4
arch/arm/mach-spear6xx/include/mach/generic.h
View File

@ -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>
/*
* Each GPT has 2 timer channels

2
arch/arm/mach-spear6xx/spear6xx.c
View File

@ -18,8 +18,8 @@
#include <asm/hardware/vic.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <mach/irqs.h>
#include <mach/generic.h>
#include <mach/irqs.h>
#include <mach/spear.h>
/* Add spear6xx machines common devices here */

2
arch/arm/plat-spear/include/plat/system.h
View File

@ -14,8 +14,8 @@
#ifndef __PLAT_SYSTEM_H
#define __PLAT_SYSTEM_H
#include <asm/hardware/sp810.h>
#include <linux/io.h>
#include <asm/hardware/sp810.h>
#include <mach/spear.h>
static inline void arch_idle(void)

6
arch/arm/plat-spear/time.c
View File

@ -20,10 +20,10 @@
#include <linux/time.h>
#include <linux/irq.h>
#include <asm/mach/time.h>
#include <mach/irqs.h>
#include <mach/hardware.h>
#include <mach/spear.h>
#include <mach/generic.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include <mach/spear.h>
/*
* We would use TIMER0 and TIMER1 as clockevent and clocksource.