plat-orion: make orion_nand available for all Orion families

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

6 files changed, 3 insertions, 6 deletions

diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index 1e124b7b0bde..1b5ed72899e5 100644
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -26,8 +26,8 @@
 #include <asm/mach/time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include <asm/plat-orion/ehci-orion.h>
+#include <asm/plat-orion/orion_nand.h>
 #include <asm/plat-orion/time.h>
 #include "common.h"
 
diff --git a/arch/arm/mach-orion/db88f5281-setup.c b/arch/arm/mach-orion/db88f5281-setup.c
index 5ef44e1a2d36..5cf65fedfae2 100644
--- a/arch/arm/mach-orion/db88f5281-setup.c
+++ b/arch/arm/mach-orion/db88f5281-setup.c
@@ -25,7 +25,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 
 /*****************************************************************************
diff --git a/arch/arm/mach-orion/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c
index 076e155ad510..38593784d76f 100644
--- a/arch/arm/mach-orion/dns323-setup.c
+++ b/arch/arm/mach-orion/dns323-setup.c
@@ -26,7 +26,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 #define DNS323_GPIO_LED_RIGHT_AMBER     1
diff --git a/arch/arm/mach-orion/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c
index 785a07bdf1e2..feae4839830b 100644
--- a/arch/arm/mach-orion/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion/kurobox_pro-setup.c
@@ -23,7 +23,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 
 /*****************************************************************************
diff --git a/arch/arm/mach-orion/rd88f5182-setup.c b/arch/arm/mach-orion/rd88f5182-setup.c
index e851b8ca5ac6..e3cc757a4ca1 100644
--- a/arch/arm/mach-orion/rd88f5182-setup.c
+++ b/arch/arm/mach-orion/rd88f5182-setup.c
@@ -25,7 +25,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 /*****************************************************************************
diff --git a/arch/arm/mach-orion/ts209-setup.c b/arch/arm/mach-orion/ts209-setup.c
index 45764dad16d0..86583e4856a1 100644
--- a/arch/arm/mach-orion/ts209-setup.c
+++ b/arch/arm/mach-orion/ts209-setup.c
@@ -27,7 +27,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 #define QNAP_TS209_NOR_BOOT_BASE 0xf4000000