From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 16 May 2010 13:40:20 +0000 (+0000)
Subject: squash platform_support.patch into rdc_boards.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6fcc255a38080201245528d2a81305d1e970af4;p=openwrt%2Fstaging%2Fblocktrron.git

squash platform_support.patch into rdc_boards.patch

SVN-Revision: 21474
---

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 26b732a3f1..0000000000
--- 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 f2a148e9c2..9012cb344a 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 @@