From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 8 Nov 2009 22:49:28 +0000 (+0000)
Subject: [rdc] move headers to arch/x86/include/asm/, patch from sn9
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=bda4e4e698ba7747d4ca210d99e7c26710e17029

[rdc] move headers to arch/x86/include/asm/, patch from sn9

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18347 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h b/target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h
deleted file mode 100644
index c8e9c8bed..000000000
--- a/target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define PFX	"rdc321x: "
-
-/* General purpose configuration and data registers */
-#define RDC3210_CFGREG_ADDR     0x0CF8
-#define RDC3210_CFGREG_DATA     0x0CFC
-
-#define RDC321X_GPIO_CTRL_REG1	0x48
-#define RDC321X_GPIO_CTRL_REG2	0x84
-#define RDC321X_GPIO_DATA_REG1	0x4c
-#define RDC321X_GPIO_DATA_REG2	0x88
-
-#define RDC321X_MAX_GPIO	58
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/gpio.h b/target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc321x_gpio.h
similarity index 100%
rename from target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/gpio.h
rename to target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc321x_gpio.h
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c
index c7eff5d2c..92df2201d 100644
--- a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c
+++ b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c
@@ -26,8 +26,8 @@
 #include <linux/types.h>
 #include <linux/module.h>
 
-#include <asm/mach-rdc321x/gpio.h>
-#include <asm/mach-rdc321x/rdc321x_defs.h>
+#include <asm/rdc321x_gpio.h>
+#include <asm/rdc321x_defs.h>
 
 
 /* spin lock to protect our private copy of GPIO data register plus
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
index 539399634..e319c02b3 100644
--- a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
+++ b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
@@ -36,7 +36,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/root_dev.h>
 
-#include <asm/mach-rdc321x/gpio.h>
+#include <asm/rdc321x_gpio.h>
 
 /* Flash */
 #ifdef CONFIG_MTD_R8610
diff --git a/target/linux/rdc/patches-2.6.30/002-platform_support.patch b/target/linux/rdc/patches-2.6.30/002-platform_support.patch
index 74fa95dbe..3e6394fb2 100644
--- a/target/linux/rdc/patches-2.6.30/002-platform_support.patch
+++ b/target/linux/rdc/patches-2.6.30/002-platform_support.patch
@@ -1,11 +1,12 @@
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -124,6 +124,10 @@ core-y += $(fcore-y)
+Index: linux-2.6.30.9/arch/x86/Makefile
+===================================================================
+--- linux-2.6.30.9.orig/arch/x86/Makefile	2009-11-06 07:29:13.739468521 -0800
++++ linux-2.6.30.9/arch/x86/Makefile	2009-11-06 07:30:29.383510569 -0800
+@@ -124,6 +124,9 @@
  # Xen paravirtualization support
  core-$(CONFIG_XEN) += arch/x86/xen/
  
 +# RDC R-321X support
-+cflags-$(CONFIG_X86_RDC321X)  := -Iarch/x86/include/asm/mach-rdc321x
 +core-$(CONFIG_X86_RDC321X)   += arch/x86/mach-rdc321x/
 +
  # lguest paravirtualization support