diff options
| -rw-r--r-- | arch/arm/mach-at91/at91_rstc.h (renamed from arch/arm/mach-at91/include/mach/at91_rstc.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9_alt_reset.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_reset.S | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 2 |
8 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/at91_rstc.h index 875fa336800b..875fa336800b 100644 --- a/arch/arm/mach-at91/include/mach/at91_rstc.h +++ b/arch/arm/mach-at91/at91_rstc.h | |||
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index bb2e17c9dfb2..99429849f780 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <mach/at91_dbgu.h> | 21 | #include <mach/at91_dbgu.h> |
| 22 | #include <mach/at91sam9260.h> | 22 | #include <mach/at91sam9260.h> |
| 23 | #include <mach/at91_pmc.h> | 23 | #include <mach/at91_pmc.h> |
| 24 | #include <mach/at91_rstc.h> | ||
| 25 | 24 | ||
| 26 | #include "at91_aic.h" | 25 | #include "at91_aic.h" |
| 26 | #include "at91_rstc.h" | ||
| 27 | #include "soc.h" | 27 | #include "soc.h" |
| 28 | #include "generic.h" | 28 | #include "generic.h" |
| 29 | #include "clock.h" | 29 | #include "clock.h" |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 09009d878ef8..c583ba224622 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #include <mach/cpu.h> | 20 | #include <mach/cpu.h> |
| 21 | #include <mach/at91sam9261.h> | 21 | #include <mach/at91sam9261.h> |
| 22 | #include <mach/at91_pmc.h> | 22 | #include <mach/at91_pmc.h> |
| 23 | #include <mach/at91_rstc.h> | ||
| 24 | 23 | ||
| 25 | #include "at91_aic.h" | 24 | #include "at91_aic.h" |
| 25 | #include "at91_rstc.h" | ||
| 26 | #include "soc.h" | 26 | #include "soc.h" |
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 0c86aa85904b..500ee19eaac9 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
| @@ -19,9 +19,9 @@ | |||
| 19 | #include <asm/system_misc.h> | 19 | #include <asm/system_misc.h> |
| 20 | #include <mach/at91sam9263.h> | 20 | #include <mach/at91sam9263.h> |
| 21 | #include <mach/at91_pmc.h> | 21 | #include <mach/at91_pmc.h> |
| 22 | #include <mach/at91_rstc.h> | ||
| 23 | 22 | ||
| 24 | #include "at91_aic.h" | 23 | #include "at91_aic.h" |
| 24 | #include "at91_rstc.h" | ||
| 25 | #include "soc.h" | 25 | #include "soc.h" |
| 26 | #include "generic.h" | 26 | #include "generic.h" |
| 27 | #include "clock.h" | 27 | #include "clock.h" |
diff --git a/arch/arm/mach-at91/at91sam9_alt_reset.S b/arch/arm/mach-at91/at91sam9_alt_reset.S index 7af2e108b8a0..f039538d3bdb 100644 --- a/arch/arm/mach-at91/at91sam9_alt_reset.S +++ b/arch/arm/mach-at91/at91sam9_alt_reset.S | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
| 17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
| 18 | #include <mach/at91_ramc.h> | 18 | #include <mach/at91_ramc.h> |
| 19 | #include <mach/at91_rstc.h> | 19 | #include "at91_rstc.h" |
| 20 | 20 | ||
| 21 | .arm | 21 | .arm |
| 22 | 22 | ||
diff --git a/arch/arm/mach-at91/at91sam9g45_reset.S b/arch/arm/mach-at91/at91sam9g45_reset.S index 9d457182c86c..721a1a34dd1d 100644 --- a/arch/arm/mach-at91/at91sam9g45_reset.S +++ b/arch/arm/mach-at91/at91sam9g45_reset.S | |||
| @@ -13,8 +13,7 @@ | |||
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
| 15 | #include <mach/at91_ramc.h> | 15 | #include <mach/at91_ramc.h> |
| 16 | #include <mach/at91_rstc.h> | 16 | #include "at91_rstc.h" |
| 17 | |||
| 18 | .arm | 17 | .arm |
| 19 | 18 | ||
| 20 | .globl at91sam9g45_restart | 19 | .globl at91sam9g45_restart |
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 5cd076b569a4..97dd8f15e09a 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #include <mach/at91_dbgu.h> | 20 | #include <mach/at91_dbgu.h> |
| 21 | #include <mach/at91sam9rl.h> | 21 | #include <mach/at91sam9rl.h> |
| 22 | #include <mach/at91_pmc.h> | 22 | #include <mach/at91_pmc.h> |
| 23 | #include <mach/at91_rstc.h> | ||
| 24 | 23 | ||
| 25 | #include "at91_aic.h" | 24 | #include "at91_aic.h" |
| 25 | #include "at91_rstc.h" | ||
| 26 | #include "soc.h" | 26 | #include "soc.h" |
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 34557400bf4d..adb6db888a1f 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | * Show the reason for the previous system reset. | 36 | * Show the reason for the previous system reset. |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <mach/at91_rstc.h> | 39 | #include "at91_rstc.h" |
| 40 | #include "at91_shdwc.h" | 40 | #include "at91_shdwc.h" |
| 41 | 41 | ||
| 42 | static void __init show_reset_status(void) | 42 | static void __init show_reset_status(void) |
