aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/magicbox/patches
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
commita1bf28950d16ca97897a524dc74ec0e52ef08fff (patch)
treecc582d4bee75a51b8c5a23ff3cef3b18f1739362 /target/linux/magicbox/patches
parent2c638cf43bb61b33f581bd057441418a30b39dc4 (diff)
downloadupstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.gz
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.bz2
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.zip
refresh 2.6.26 patches
SVN-Revision: 13135
Diffstat (limited to 'target/linux/magicbox/patches')
-rw-r--r--target/linux/magicbox/patches/001-magicbox_support.patch10
-rw-r--r--target/linux/magicbox/patches/100-cf_slot.patch2
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/magicbox/patches/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch
index fe1221392f..984902f7a5 100644
--- a/target/linux/magicbox/patches/001-magicbox_support.patch
+++ b/target/linux/magicbox/patches/001-magicbox_support.patch
@@ -1,6 +1,6 @@
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
-@@ -53,6 +53,12 @@
+@@ -53,6 +53,12 @@ config WALNUT
help
This option enables support for the IBM PPC405GP evaluation board.
@@ -13,7 +13,7 @@
config XILINX_ML300
bool "Xilinx-ML300"
select XILINX_VIRTEX_II_PRO
-@@ -184,7 +190,7 @@
+@@ -184,7 +190,7 @@ config BOOKE
config IBM_OCP
bool
@@ -22,7 +22,7 @@
default y
config IBM_EMAC4
-@@ -194,7 +200,7 @@
+@@ -194,7 +200,7 @@ config IBM_EMAC4
config BIOS_FIXUP
bool
@@ -31,7 +31,7 @@
default y
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
-@@ -205,7 +211,7 @@
+@@ -205,7 +211,7 @@ config 403GCX
config 405EP
bool
@@ -42,7 +42,7 @@
config 405GP
--- a/arch/ppc/platforms/4xx/Makefile
+++ b/arch/ppc/platforms/4xx/Makefile
-@@ -14,6 +14,7 @@
+@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6) += redwood6.o
obj-$(CONFIG_SYCAMORE) += sycamore.o
obj-$(CONFIG_TAISHAN) += taishan.o
obj-$(CONFIG_WALNUT) += walnut.o
diff --git a/target/linux/magicbox/patches/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch
index f6304b7b6b..c37497342e 100644
--- a/target/linux/magicbox/patches/100-cf_slot.patch
+++ b/target/linux/magicbox/patches/100-cf_slot.patch
@@ -1,6 +1,6 @@
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
-@@ -928,6 +928,14 @@
+@@ -928,6 +928,14 @@ config BLK_DEV_MPC8xx_IDE
If unsure, say N.