From 85ec5ce98d8ba7e2ad3a877230b5f7e1b280d4c5 Mon Sep 17 00:00:00 2001
From: jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 13 Nov 2011 10:48:05 +0000
Subject: linux: update 3.1 to 3.1.1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch')

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>
-- 
cgit v1.2.3