From 7efebe60e89ec6d0c9630affe04d8892c574553b Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 8 Feb 2009 13:01:28 +0000
Subject: [kernel] update to 2.6.28.4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14441 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/ppc44x/Makefile                                      | 2 +-
 target/linux/ppc44x/patches/004-canyonlands_dts_sync.patch        | 8 ++++----
 .../ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch | 2 +-
 target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'target/linux/ppc44x')

diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 4f023a38d..00c0d723a 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -11,7 +11,7 @@ BOARD:=ppc44x
 BOARDNAME:=AMCC/IBM PPC44x
 FEATURES:=squashfs
 
-LINUX_VERSION:=2.6.28.2
+LINUX_VERSION:=2.6.28.4
 LINUX_KARCH:=powerpc
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc44x/patches/004-canyonlands_dts_sync.patch b/target/linux/ppc44x/patches/004-canyonlands_dts_sync.patch
index 83e6c74e1..c89664299 100644
--- a/target/linux/ppc44x/patches/004-canyonlands_dts_sync.patch
+++ b/target/linux/ppc44x/patches/004-canyonlands_dts_sync.patch
@@ -69,7 +69,7 @@
  		POB0: opb {
  			compatible = "ibm,opb-460ex", "ibm,opb";
  			#address-cells = <1>;
-@@ -222,6 +282,12 @@
+@@ -222,6 +270,12 @@
  				reg = <0xef600700 0x00000014>;
  				interrupt-parent = <&UIC0>;
  				interrupts = <0x2 0x4>;
@@ -82,7 +82,7 @@
  			};
  
  			IIC1: i2c@ef600800 {
-@@ -331,6 +397,7 @@
+@@ -331,6 +385,7 @@
  			 * later cannot be changed
  			 */
  			ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
@@ -90,7 +90,7 @@
  				  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
  
  			/* Inbound 2GB range starting at 0 */
-@@ -361,6 +428,7 @@
+@@ -361,6 +416,7 @@
  			 * later cannot be changed
  			 */
  			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
@@ -98,7 +98,7 @@
  				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
  
  			/* Inbound 2GB range starting at 0 */
-@@ -402,6 +470,7 @@
+@@ -402,6 +458,7 @@
  			 * later cannot be changed
  			 */
  			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
diff --git a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch b/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch
index e05278cf2..d0e08b7a9 100644
--- a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch
+++ b/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/boot/dts/canyonlands.dts
 +++ b/arch/powerpc/boot/dts/canyonlands.dts
-@@ -195,28 +195,6 @@
+@@ -243,28 +243,6 @@
  				interrupts = <0x1 0x4>;
  			};
  
diff --git a/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch b/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
index 3ab51d8db..3c1a7570a 100644
--- a/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
+++ b/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/dts/taishan.dts	2009-01-18 19:45:37.000000000 +0100
-+++ b/arch/powerpc/boot/dts/taishan.dts	2009-01-29 18:55:40.000000000 +0100
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
 @@ -423,5 +423,6 @@
  
  	chosen {
-- 
cgit v1.2.3