aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/320-nokia-various.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
commitd8acb75009ad7f674609664810fef3a11d72205e (patch)
treed66c7e0323af53562e5f0e4e0fd7d9ab49d3ca7a /target/linux/omap24xx/patches-3.1/320-nokia-various.patch
parenta8797d0de6fac61582e9e9212e55e0bc1449f4b1 (diff)
downloadupstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.gz
upstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.bz2
upstream-d8acb75009ad7f674609664810fef3a11d72205e.zip
linux: update 3.1 to 3.1.1
SVN-Revision: 29007
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/320-nokia-various.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/320-nokia-various.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/omap24xx/patches-3.1/320-nokia-various.patch b/target/linux/omap24xx/patches-3.1/320-nokia-various.patch
index b548b38b5a..1c89348141 100644
--- a/target/linux/omap24xx/patches-3.1/320-nokia-various.patch
+++ b/target/linux/omap24xx/patches-3.1/320-nokia-various.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:56.000000000 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:22.288178756 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -25,6 +25,8 @@
#include <linux/usb/musb.h>
#include <sound/tlv320aic3x.h>