summaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-13 10:48:05 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-13 10:48:05 +0000
commit85ec5ce98d8ba7e2ad3a877230b5f7e1b280d4c5 (patch)
treeaa5d6eb24cbb7886936f09c1f3d28f7979c05ea4 /target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
parente5c40dc4c357665c3129ac5ad15943643183c32e (diff)
linux: update 3.1 to 3.1.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch b/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
index f0fe02753..cd9a43b61 100644
--- a/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
+++ b/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod.c 2011-10-30 21:20:19.205515660 +0100
-+++ linux-3.1/arch/arm/mach-omap2/omap_hwmod.c 2011-10-30 21:28:16.769945954 +0100
+--- a/arch/arm/mach-omap2/omap_hwmod.c
++++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -145,6 +145,8 @@
#include <plat/omap_hwmod.h>
#include <plat/prcm.h>