diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-19 18:23:31 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-19 18:23:31 +0000 |
commit | c1dc6df8bd19306f1b7981cc28618bb8ffce8697 (patch) | |
tree | e9bfa33203f0a4f3484fad690bb2626e7438ff15 /target/linux/ppc44x | |
parent | f86e4123891689ddfd3b6112ac3dacaefeb5a536 (diff) | |
download | upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.gz upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.bz2 upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.zip |
kernel: update linux 3.2 to 3.2.12
SVN-Revision: 31028
Diffstat (limited to 'target/linux/ppc44x')
-rw-r--r-- | target/linux/ppc44x/Makefile | 2 | ||||
-rw-r--r-- | target/linux/ppc44x/patches/100-openwrt_flashmap.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 629eab0361..35addf25da 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.2.11 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch index 225831a4b6..471e686d32 100644 --- a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch +++ b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch @@ -25,7 +25,7 @@ label = "env"; --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts -@@ -217,24 +217,12 @@ +@@ -222,24 +222,12 @@ #address-cells = <1>; #size-cells = <1>; partition@0 { |