aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-07-19 09:40:26 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-07-19 09:40:26 +0000
commit098e6845ef0fadba56fb0f77620271aa132f332f (patch)
treedf347e1acd314c1340de92be2090d8101a14fae3 /target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
parentf8148d2f9578cc61df9b9df2a9b22ee18bad15f1 (diff)
downloadupstream-098e6845ef0fadba56fb0f77620271aa132f332f.tar.gz
upstream-098e6845ef0fadba56fb0f77620271aa132f332f.tar.bz2
upstream-098e6845ef0fadba56fb0f77620271aa132f332f.zip
refresh 2.6.30 patches
SVN-Revision: 16915
Diffstat (limited to 'target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch')
-rw-r--r--target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
index 1fa74b8890..1a9232142c 100644
--- a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
+++ b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
@@ -297,7 +297,7 @@
+};
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -75,7 +75,8 @@
+@@ -75,7 +75,8 @@ 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 \
@@ -307,7 +307,7 @@
src-boot := $(src-wlib) $(src-plat) empty.c
src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -193,6 +194,7 @@
+@@ -193,6 +194,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40
image-$(CONFIG_WALNUT) += treeImage.walnut
image-$(CONFIG_ACADIA) += cuImage.acadia
image-$(CONFIG_MAGICBOXV1) += cuImage.magicboxv1
@@ -317,7 +317,7 @@
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -59,6 +59,16 @@
+@@ -59,6 +59,16 @@ config MAGICBOXV1
help
This option enables support for the Magicbox v1 board.
@@ -336,7 +336,7 @@
depends on 40x
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -53,6 +53,7 @@
+@@ -53,6 +53,7 @@ machine_device_initcall(ppc40x_simple, p
static char *board[] __initdata = {
"amcc,acadia",
"magicboxv1",