From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 30 Oct 2012 00:07:11 +0000 (+0800) Subject: arm: at91: move at91_shdwc.h to arch/arm/mach-at91 X-Git-Tag: v3.8-rc1~145^2~2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=176bdd2c54ffddb4ea0ba1d1db170832f2085e61;p=thirdparty%2Fkernel%2Flinux.git arm: at91: move at91_shdwc.h to arch/arm/mach-at91 This is only used by old boards style or via core code. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Cc: Nicolas Ferre --- diff --git a/arch/arm/mach-at91/include/mach/at91_shdwc.h b/arch/arm/mach-at91/at91_shdwc.h similarity index 100% rename from arch/arm/mach-at91/include/mach/at91_shdwc.h rename to arch/arm/mach-at91/at91_shdwc.h diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index c4bdea7bf2c19..33b1628467ea4 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c @@ -41,9 +41,9 @@ #include #include -#include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index d0d5fe6880803..f0135cd1d8587 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -42,10 +42,10 @@ #include #include -#include #include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index 5850eb4775b32..13ebaa8e4100e 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -46,10 +46,10 @@ #include #include -#include #include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index b8443aeca4a87..89b9608742a72 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c @@ -45,10 +45,10 @@ #include #include -#include #include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 6b2a983159c4a..e4cc375e3a328 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -43,10 +43,10 @@ #include #include -#include #include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 6bd8853db30d3..377a1097afa71 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -31,10 +31,10 @@ #include #include -#include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index c93f906cf15c9..c1060f96e5898 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c @@ -42,9 +42,9 @@ #include #include -#include #include "at91_aic.h" +#include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index e8cb6b811df3c..34557400bf4d1 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -37,7 +37,7 @@ */ #include -#include +#include "at91_shdwc.h" static void __init show_reset_status(void) { diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 0b32c81730a57..8a66979f56111 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -18,8 +18,8 @@ #include #include #include -#include +#include "at91_shdwc.h" #include "soc.h" #include "generic.h"