commit 17d2cc25f04462fd5d835318f02fb5492576ab4b
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Fri Nov 18 00:36:21 2011 +0800
committer Nicolas Ferre <nicolas.ferre@atmel.com> Fri Jan 20 17:20:23 2012 +0100
tree b6dbbed652f60780efb044b8eb857f433db17ed0
parent 6522ecdcfaae90ad1d2dd868fbdf3a2ddfc5f257

ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

arch/arm/mach-at91/pm_slowclock.S

diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S
index f7922a4..92dfb84 100644
--- a/arch/arm/mach-at91/pm_slowclock.S
+++ b/arch/arm/mach-at91/pm_slowclock.S
@@ -18,9 +18,8 @@
 
 #if defined(CONFIG_ARCH_AT91RM9200)
 #include <mach/at91rm9200_mc.h>
-#elif defined(CONFIG_ARCH_AT91CAP9)
-#include <mach/at91cap9_ddrsdr.h>
-#elif defined(CONFIG_ARCH_AT91SAM9G45)
+#elif defined(CONFIG_ARCH_AT91CAP9) \
+	|| defined(CONFIG_ARCH_AT91SAM9G45)
 #include <mach/at91sam9_ddrsdr.h>
 #else
 #include <mach/at91sam9_sdramc.h>