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 | 81de1500bce0182ff93c79f912c61b5694ed5f8d (patch) | |
tree | a0cb7b7fc6576c200ed565de825735e13e991f13 /target/linux/ppc44x | |
parent | adf7b3da4490f07a8fab2118b8121b8f24bc8741 (diff) | |
download | upstream-81de1500bce0182ff93c79f912c61b5694ed5f8d.tar.gz upstream-81de1500bce0182ff93c79f912c61b5694ed5f8d.tar.bz2 upstream-81de1500bce0182ff93c79f912c61b5694ed5f8d.zip |
kernel: update linux 3.2 to 3.2.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31028 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 { |