diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-11-08 22:49:28 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-11-08 22:49:28 +0000 |
| commit | 4bb74e31f012176c4189bba329cc5ece40b26fdb (patch) | |
| tree | 8e739c52542ffba04398b60a869228f1c0a6b8a3 | |
| parent | cce5a0876d97c07069f644dc027603cc23675023 (diff) | |
| download | upstream-4bb74e31f012176c4189bba329cc5ece40b26fdb.tar.gz upstream-4bb74e31f012176c4189bba329cc5ece40b26fdb.tar.bz2 upstream-4bb74e31f012176c4189bba329cc5ece40b26fdb.zip | |
[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
| -rw-r--r-- | target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h | 12 | ||||
| -rw-r--r-- | target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc321x_gpio.h (renamed from target/linux/rdc/files-2.6.30/arch/x86/include/asm/mach-rdc321x/gpio.h) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c | 4 | ||||
| -rw-r--r-- | target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c | 2 | ||||
| -rw-r--r-- | target/linux/rdc/patches-2.6.30/002-platform_support.patch | 9 |
5 files changed, 8 insertions, 19 deletions
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 c8e9c8bed3..0000000000 --- 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 index 873bffe302..873bffe302 100644 --- 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 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 c7eff5d2c0..92df2201df 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 5393996343..e319c02b33 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 74fa95dbea..3e6394fb27 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 |