summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-16 13:40:20 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-16 13:40:20 +0000
commit2c44ebe5490ca56b501e82dd6ae4acdca01bf17e (patch)
tree6812888964814a299f0b43bef7c34411f026c648
parent6dd2c6c98f642aa00456fec7e483bdd6c734182b (diff)
[rdc] squash platform_support.patch into rdc_boards.patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21474 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/rdc/patches-2.6.32/100-platform_support.patch12
-rw-r--r--target/linux/rdc/patches-2.6.32/100-rdc_boards.patch13
2 files changed, 13 insertions, 12 deletions
diff --git a/target/linux/rdc/patches-2.6.32/100-platform_support.patch b/target/linux/rdc/patches-2.6.32/100-platform_support.patch
deleted file mode 100644
index 26b732a3f..000000000
--- a/target/linux/rdc/patches-2.6.32/100-platform_support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -125,6 +125,9 @@ libs-y += arch/x86/lib/
- # See arch/x86/Kbuild for content of core part of the kernel
- core-y += arch/x86/
-
-+# RDC R-321X support
-+core-$(CONFIG_X86_RDC321X) += arch/x86/mach-rdc321x/
-+
- # drivers-y are linked after core-y
- drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
- drivers-$(CONFIG_PCI) += arch/x86/pci/
diff --git a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
index f2a148e9c..9012cb344 100644
--- a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
+++ b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
@@ -1,3 +1,16 @@
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -125,6 +125,9 @@ libs-y += arch/x86/lib/
+ # See arch/x86/Kbuild for content of core part of the kernel
+ core-y += arch/x86/
+
++# RDC R-321X support
++core-$(CONFIG_X86_RDC321X) += arch/x86/mach-rdc321x/
++
+ # drivers-y are linked after core-y
+ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
+ drivers-$(CONFIG_PCI) += arch/x86/pci/
+
--- /dev/null
+++ b/arch/x86/mach-rdc321x/Makefile
@@ -0,0 +1,5 @@