Commit 410782be authored by viresh kumar's avatar viresh kumar Committed by Russell King
Browse files

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: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4b9502e1

arch/arm/mach-spear3xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-spear3xx/include/mach/entry-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-spear3xx/include/mach/generic.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-spear3xx/spear300.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-spear3xx/spear310.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE