update to 2.6.26
SVN-Revision: 12066
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Kconfig
|
||||
+++ linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
@@ -53,6 +53,12 @@ config WALNUT
|
||||
--- a/arch/ppc/platforms/4xx/Kconfig
|
||||
+++ b/arch/ppc/platforms/4xx/Kconfig
|
||||
@@ -53,6 +53,12 @@
|
||||
help
|
||||
This option enables support for the IBM PPC405GP evaluation board.
|
||||
|
||||
@@ -15,7 +13,7 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
config XILINX_ML300
|
||||
bool "Xilinx-ML300"
|
||||
select XILINX_VIRTEX_II_PRO
|
||||
@@ -184,7 +190,7 @@ config BOOKE
|
||||
@@ -184,7 +190,7 @@
|
||||
|
||||
config IBM_OCP
|
||||
bool
|
||||
@@ -24,7 +22,7 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
default y
|
||||
|
||||
config IBM_EMAC4
|
||||
@@ -194,7 +200,7 @@ config IBM_EMAC4
|
||||
@@ -194,7 +200,7 @@
|
||||
|
||||
config BIOS_FIXUP
|
||||
bool
|
||||
@@ -33,7 +31,7 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
default y
|
||||
|
||||
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
|
||||
@@ -205,7 +211,7 @@ config 403GCX
|
||||
@@ -205,7 +211,7 @@
|
||||
|
||||
config 405EP
|
||||
bool
|
||||
@@ -42,11 +40,9 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
|
||||
default y
|
||||
|
||||
config 405GP
|
||||
Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Makefile
|
||||
+++ linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
|
||||
@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6) += redwood6.o
|
||||
--- a/arch/ppc/platforms/4xx/Makefile
|
||||
+++ b/arch/ppc/platforms/4xx/Makefile
|
||||
@@ -14,6 +14,7 @@
|
||||
obj-$(CONFIG_SYCAMORE) += sycamore.o
|
||||
obj-$(CONFIG_TAISHAN) += taishan.o
|
||||
obj-$(CONFIG_WALNUT) += walnut.o
|
||||
@@ -54,10 +50,8 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
|
||||
obj-$(CONFIG_XILINX_ML300) += xilinx_ml300.o
|
||||
obj-$(CONFIG_XILINX_ML403) += xilinx_ml403.o
|
||||
|
||||
Index: linux-2.6.24.7/include/asm-ppc/ibm4xx.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/include/asm-ppc/ibm4xx.h
|
||||
+++ linux-2.6.24.7/include/asm-ppc/ibm4xx.h
|
||||
--- a/include/asm-ppc/ibm4xx.h
|
||||
+++ b/include/asm-ppc/ibm4xx.h
|
||||
@@ -19,6 +19,10 @@
|
||||
|
||||
#ifdef CONFIG_40x
|
||||
|
||||
Reference in New Issue
Block a user