summaryrefslogtreecommitdiffstats
path: root/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-19 09:40:26 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-19 09:40:26 +0000
commit5dbd58d5976ffe07e36c6c4df2574c5278b4419e (patch)
tree67c8908aa3f48eaf7f41ac732a64ed1b2caf34ce /target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
parent8561d8bc11138d26535b717d664794e2637d6f3e (diff)
[ppc40x] refresh 2.6.30 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16915 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch')
-rw-r--r--target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch b/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
index 062bbdbce..990eb5335 100644
--- a/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
+++ b/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
@@ -264,7 +264,7 @@
+};
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
@@ -273,7 +273,7 @@
src-boot := $(src-wlib) $(src-plat) empty.c
src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -192,6 +192,7 @@
+@@ -192,6 +192,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImag
image-$(CONFIG_EP405) += dtbImage.ep405
image-$(CONFIG_WALNUT) += treeImage.walnut
image-$(CONFIG_ACADIA) += cuImage.acadia
@@ -283,7 +283,7 @@
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -49,6 +49,16 @@
+@@ -49,6 +49,16 @@ config KILAUEA
help
This option enables support for the AMCC PPC405EX evaluation board.
@@ -302,7 +302,7 @@
depends on 40x
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -51,7 +51,8 @@
+@@ -51,7 +51,8 @@ machine_device_initcall(ppc40x_simple, p
* board.c file for it rather than adding it to this list.
*/
static char *board[] __initdata = {