diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:27:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:29:20 +0100 |
| commit | 5db45002576f7d60c5bf7b23e277845cd3e806be (patch) | |
| tree | 18cf276c8c0d64c5011784b814db586c0d5476cb /drivers/power/reset | |
| parent | Merge branch 'brcm/stb-smp-uart' into next/drivers (diff) | |
| parent | ARM: at91: remove unused board.h file (diff) | |
| download | linux-dev-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.xz linux-dev-5db45002576f7d60c5bf7b23e277845cd3e806be.zip | |
Merge branch 'at91/cleanup5' into next/drivers
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/power/reset')
| -rw-r--r-- | drivers/power/reset/at91-reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 3cb36693343a..69a75d99ae92 100644 --- a/drivers/power/reset/at91-reset.c +++ b/drivers/power/reset/at91-reset.c @@ -19,8 +19,8 @@ #include <asm/system_misc.h> -#include <mach/at91sam9_ddrsdr.h> -#include <mach/at91sam9_sdramc.h> +#include <soc/at91/at91sam9_ddrsdr.h> +#include <soc/at91/at91sam9_sdramc.h> #define AT91_RSTC_CR 0x00 /* Reset Controller Control Register */ #define AT91_RSTC_PROCRST BIT(0) /* Processor Reset */ |