linux: update 3.1 to 3.1.1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73

21 files changed, 161 insertions, 321 deletions

diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile
index 0605b49c5..e8280ed03 100644
--- a/target/linux/omap24xx/Makefile
+++ b/target/linux/omap24xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
 MAINTAINER:=Michael Buesch <m@bues.ch>
 FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
 
-LINUX_VERSION:=3.1
+LINUX_VERSION:=3.1.1
 
 define Target/Description
 	TI OMAP-24xx
diff --git a/target/linux/omap24xx/patches-3.1/200-omap-platform.patch b/target/linux/omap24xx/patches-3.1/200-omap-platform.patch
index 92869bb00..9a2e9436f 100644
--- a/target/linux/omap24xx/patches-3.1/200-omap-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/200-omap-platform.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/arm/plat-omap/bootreason.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/plat-omap/bootreason.c	2011-10-30 00:48:34.877053219 +0200
+--- /dev/null
++++ b/arch/arm/plat-omap/bootreason.c
 @@ -0,0 +1,79 @@
 +/*
 + * linux/arch/arm/plat-omap/bootreason.c
@@ -82,10 +80,8 @@ Index: linux-3.1/arch/arm/plat-omap/bootreason.c
 +}
 +
 +late_initcall(bootreason_init);
-Index: linux-3.1/arch/arm/plat-omap/common.c
-===================================================================
---- linux-3.1.orig/arch/arm/plat-omap/common.c	2011-10-30 00:48:32.781054651 +0200
-+++ linux-3.1/arch/arm/plat-omap/common.c	2011-10-30 00:48:34.877053219 +0200
+--- a/arch/arm/plat-omap/common.c
++++ b/arch/arm/plat-omap/common.c
 @@ -21,18 +21,90 @@
  #include <plat/vram.h>
  #include <plat/dsp.h>
@@ -177,10 +173,8 @@ Index: linux-3.1/arch/arm/plat-omap/common.c
  	/* Try to find the config from the board-specific structures
  	 * in the kernel. */
  	for (i = 0; i < omap_board_config_size; i++) {
-Index: linux-3.1/arch/arm/plat-omap/component-version.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/plat-omap/component-version.c	2011-10-30 00:48:34.877053219 +0200
+--- /dev/null
++++ b/arch/arm/plat-omap/component-version.c
 @@ -0,0 +1,64 @@
 +/*
 + *  linux/arch/arm/plat-omap/component-version.c
@@ -246,10 +240,8 @@ Index: linux-3.1/arch/arm/plat-omap/component-version.c
 +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
 +MODULE_DESCRIPTION("Component version driver");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/arch/arm/plat-omap/Kconfig
-===================================================================
---- linux-3.1.orig/arch/arm/plat-omap/Kconfig	2011-10-30 00:48:32.933054543 +0200
-+++ linux-3.1/arch/arm/plat-omap/Kconfig	2011-10-30 00:48:34.877053219 +0200
+--- a/arch/arm/plat-omap/Kconfig
++++ b/arch/arm/plat-omap/Kconfig
 @@ -82,6 +82,38 @@ config OMAP_RESET_CLOCKS
  	  probably do not want this option enabled until your
  	  device drivers work properly.
@@ -289,10 +281,8 @@ Index: linux-3.1/arch/arm/plat-omap/Kconfig
  config OMAP_MUX
  	bool "OMAP multiplexing support"
  	depends on ARCH_OMAP
-Index: linux-3.1/arch/arm/plat-omap/Makefile
-===================================================================
---- linux-3.1.orig/arch/arm/plat-omap/Makefile	2011-10-30 00:48:32.953054530 +0200
-+++ linux-3.1/arch/arm/plat-omap/Makefile	2011-10-30 00:48:34.877053219 +0200
+--- a/arch/arm/plat-omap/Makefile
++++ b/arch/arm/plat-omap/Makefile
 @@ -23,6 +23,9 @@ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu-
  
  obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
@@ -303,10 +293,8 @@ Index: linux-3.1/arch/arm/plat-omap/Makefile
  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
  obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
  i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
-Index: linux-3.1/arch/arm/include/asm/setup.h
-===================================================================
---- linux-3.1.orig/arch/arm/include/asm/setup.h	2011-10-30 00:48:32.965054522 +0200
-+++ linux-3.1/arch/arm/include/asm/setup.h	2011-10-30 00:48:34.877053219 +0200
+--- a/arch/arm/include/asm/setup.h
++++ b/arch/arm/include/asm/setup.h
 @@ -136,6 +136,13 @@ struct tag_acorn {
  	__u8 adfsdrives;
  };
@@ -333,10 +321,8 @@ Index: linux-3.1/arch/arm/include/asm/setup.h
  		 * DC21285 specific
  		 */
  		struct tag_memclk	memclk;
-Index: linux-3.1/arch/arm/plat-omap/gpio-switch.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/plat-omap/gpio-switch.c	2011-10-30 00:48:34.877053219 +0200
+--- /dev/null
++++ b/arch/arm/plat-omap/gpio-switch.c
 @@ -0,0 +1,554 @@
 +/*
 + *  linux/arch/arm/plat-omap/gpio-switch.c
@@ -892,10 +878,8 @@ Index: linux-3.1/arch/arm/plat-omap/gpio-switch.c
 +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com");
 +MODULE_DESCRIPTION("GPIO switch driver");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/arch/arm/plat-omap/include/plat/board.h
-===================================================================
---- linux-3.1.orig/arch/arm/plat-omap/include/plat/board.h	2011-10-30 00:48:32.949054532 +0200
-+++ linux-3.1/arch/arm/plat-omap/include/plat/board.h	2011-10-30 00:48:34.877053219 +0200
+--- a/arch/arm/plat-omap/include/plat/board.h
++++ b/arch/arm/plat-omap/include/plat/board.h
 @@ -151,6 +151,14 @@ struct omap_board_config_kernel {
  	const void *data;
  };
diff --git a/target/linux/omap24xx/patches-3.1/250-cbus.patch b/target/linux/omap24xx/patches-3.1/250-cbus.patch
index bb7a6c984..d8798368a 100644
--- a/target/linux/omap24xx/patches-3.1/250-cbus.patch
+++ b/target/linux/omap24xx/patches-3.1/250-cbus.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/cbus/cbus.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/cbus.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/cbus.c
 @@ -0,0 +1,333 @@
 +/*
 + * drivers/cbus/cbus.c
@@ -336,10 +334,8 @@ Index: linux-3.1/drivers/cbus/cbus.c
 +MODULE_AUTHOR("Mikko Ylinen");
 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
 +
-Index: linux-3.1/drivers/cbus/cbus.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/cbus.h	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/cbus.h
 @@ -0,0 +1,30 @@
 +/*
 + * drivers/cbus/cbus.h
@@ -371,10 +367,8 @@ Index: linux-3.1/drivers/cbus/cbus.h
 +		unsigned val);
 +
 +#endif /* __DRIVERS_CBUS_CBUS_H */
-Index: linux-3.1/drivers/cbus/Kconfig
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/Kconfig	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/Kconfig
 @@ -0,0 +1,86 @@
 +#
 +# CBUS device configuration
@@ -462,10 +456,8 @@ Index: linux-3.1/drivers/cbus/Kconfig
 +endif # CBUS_RETU
 +
 +endmenu
-Index: linux-3.1/drivers/cbus/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/Makefile	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/Makefile
 @@ -0,0 +1,13 @@
 +#
 +# Makefile for CBUS.
@@ -480,10 +472,8 @@ Index: linux-3.1/drivers/cbus/Makefile
 +obj-$(CONFIG_CBUS_RETU_RTC)	+= retu-rtc.o
 +obj-$(CONFIG_CBUS_RETU_WDT)	+= retu-wdt.o
 +obj-$(CONFIG_CBUS_RETU_HEADSET)	+= retu-headset.o
-Index: linux-3.1/drivers/cbus/retu.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu.c
 @@ -0,0 +1,549 @@
 +/**
 + * drivers/cbus/retu.c
@@ -1034,10 +1024,8 @@ Index: linux-3.1/drivers/cbus/retu.c
 +MODULE_AUTHOR("Juha Yrjölä");
 +MODULE_AUTHOR("David Weinehall");
 +MODULE_AUTHOR("Mikko Ylinen");
-Index: linux-3.1/drivers/cbus/retu.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu.h	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu.h
 @@ -0,0 +1,85 @@
 +/**
 + * drivers/cbus/retu.h
@@ -1124,10 +1112,8 @@ Index: linux-3.1/drivers/cbus/retu.h
 +int retu_read_adc(struct device *child, int channel);
 +
 +#endif /* __DRIVERS_CBUS_RETU_H */
-Index: linux-3.1/drivers/cbus/retu-headset.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu-headset.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu-headset.c
 @@ -0,0 +1,359 @@
 +/**
 + * Retu/Vilma headset detection
@@ -1488,10 +1474,8 @@ Index: linux-3.1/drivers/cbus/retu-headset.c
 +MODULE_DESCRIPTION("Retu/Vilma headset detection");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä");
-Index: linux-3.1/drivers/cbus/retu-pwrbutton.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu-pwrbutton.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu-pwrbutton.c
 @@ -0,0 +1,165 @@
 +/**
 + * drivers/cbus/retu-pwrbutton.c
@@ -1658,10 +1642,8 @@ Index: linux-3.1/drivers/cbus/retu-pwrbutton.c
 +MODULE_AUTHOR("Ari Saastamoinen");
 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
 +
-Index: linux-3.1/drivers/cbus/retu-rtc.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu-rtc.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu-rtc.c
 @@ -0,0 +1,287 @@
 +/**
 + * drivers/cbus/retu-rtc.c
@@ -1950,10 +1932,8 @@ Index: linux-3.1/drivers/cbus/retu-rtc.c
 +MODULE_AUTHOR("Igor Stoppa");
 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
 +
-Index: linux-3.1/drivers/cbus/retu-wdt.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/retu-wdt.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/retu-wdt.c
 @@ -0,0 +1,272 @@
 +/**
 + * drivers/cbus/retu-wdt.c
@@ -2227,10 +2207,8 @@ Index: linux-3.1/drivers/cbus/retu-wdt.c
 +MODULE_DESCRIPTION("Retu WatchDog");
 +MODULE_AUTHOR("Amit Kucheria");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/drivers/cbus/tahvo.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/tahvo.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/tahvo.c
 @@ -0,0 +1,423 @@
 +/**
 + * drivers/cbus/tahvo.c
@@ -2655,10 +2633,8 @@ Index: linux-3.1/drivers/cbus/tahvo.c
 +MODULE_AUTHOR("David Weinehall");
 +MODULE_AUTHOR("Mikko Ylinen");
 +
-Index: linux-3.1/drivers/cbus/tahvo.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/tahvo.h	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/tahvo.h
 @@ -0,0 +1,58 @@
 +/*
 + * drivers/cbus/tahvo.h
@@ -2718,10 +2694,8 @@ Index: linux-3.1/drivers/cbus/tahvo.h
 +		u16 clear);
 +
 +#endif /* __DRIVERS_CBUS_TAHVO_H */
-Index: linux-3.1/drivers/cbus/tahvo-usb.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/tahvo-usb.c	2011-10-30 00:48:42.989047642 +0200
+--- /dev/null
++++ b/drivers/cbus/tahvo-usb.c
 @@ -0,0 +1,740 @@
 +/**
 + * drivers/cbus/tahvo-usb.c
@@ -3463,10 +3437,8 @@ Index: linux-3.1/drivers/cbus/tahvo-usb.c
 +MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs");
-Index: linux-3.1/drivers/Makefile
-===================================================================
---- linux-3.1.orig/drivers/Makefile	2011-10-30 00:48:29.709056726 +0200
-+++ linux-3.1/drivers/Makefile	2011-10-30 00:48:42.989047642 +0200
+--- a/drivers/Makefile
++++ b/drivers/Makefile
 @@ -76,7 +76,7 @@ obj-$(CONFIG_GAMEPORT)		+= input/gamepor
  obj-$(CONFIG_INPUT)		+= input/
  obj-$(CONFIG_I2O)		+= message/
@@ -3476,10 +3448,8 @@ Index: linux-3.1/drivers/Makefile
  obj-$(CONFIG_PPS)		+= pps/
  obj-$(CONFIG_PTP_1588_CLOCK)	+= ptp/
  obj-$(CONFIG_W1)		+= w1/
-Index: linux-3.1/drivers/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/Kconfig	2011-10-30 00:48:29.653056764 +0200
-+++ linux-3.1/drivers/Kconfig	2011-10-30 00:48:42.989047642 +0200
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
 @@ -2,6 +2,8 @@ menu "Device Drivers"
  
  source "drivers/base/Kconfig"
diff --git a/target/linux/omap24xx/patches-3.1/251-cbus-tahvo-lock-fix.patch b/target/linux/omap24xx/patches-3.1/251-cbus-tahvo-lock-fix.patch
index ac3bd04a8..be406716a 100644
--- a/target/linux/omap24xx/patches-3.1/251-cbus-tahvo-lock-fix.patch
+++ b/target/linux/omap24xx/patches-3.1/251-cbus-tahvo-lock-fix.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/cbus/tahvo.c
-===================================================================
---- linux-3.1.orig/drivers/cbus/tahvo.c	2011-11-05 17:03:39.598846119 +0100
-+++ linux-3.1/drivers/cbus/tahvo.c	2011-11-05 17:04:36.274768324 +0100
+--- a/drivers/cbus/tahvo.c
++++ b/drivers/cbus/tahvo.c
 @@ -104,7 +104,9 @@ void tahvo_write_reg(struct device *chil
  {
  	struct tahvo		*tahvo = dev_get_drvdata(child->parent);
diff --git a/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch b/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
index abc724359..a5783754b 100644
--- a/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/300-cbus-platform.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 21:04:56.008818251 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c	2011-10-30 21:14:31.600257909 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
 @@ -15,8 +15,11 @@
  #include <linux/delay.h>
  #include <linux/gpio.h>
@@ -134,10 +132,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
  	/* FIXME: add n810 spi devices */
  	spi_register_board_info(n800_spi_board_info,
  				ARRAY_SIZE(n800_spi_board_info));
-Index: linux-3.1/include/linux/platform_data/cbus.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/include/linux/platform_data/cbus.h	2011-10-30 21:05:07.540709042 +0100
+--- /dev/null
++++ b/include/linux/platform_data/cbus.h
 @@ -0,0 +1,38 @@
 +/*
 + * cbus.h - CBUS platform_data definition
diff --git a/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch b/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
index 5ac1360e0..4c630e148 100644
--- a/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
+++ b/target/linux/omap24xx/patches-3.1/310-n810-lcd.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 21:14:31.600257909 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c	2011-10-30 21:14:46.712140689 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
 @@ -24,6 +24,7 @@
  #include <linux/spi/spi.h>
  #include <linux/usb/musb.h>
@@ -124,10 +122,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
  	gpmc_onenand_init(board_onenand_data);
  	n8x0_mmc_init();
  	n8x0_usb_init();
-Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c	2011-10-30 21:14:46.712140689 +0100
+--- /dev/null
++++ b/arch/arm/mach-omap2/board-n8x0-lcd.c
 @@ -0,0 +1,231 @@
 +/*
 + * linux/arch/arm/mach-omap2/board-n8x0.c
@@ -360,10 +356,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
 +
 +	printk(KERN_INFO "N8x0 Blizzard initialized");
 +}
-Index: linux-3.1/arch/arm/mach-omap2/Makefile
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/Makefile	2011-10-30 21:14:31.608257847 +0100
-+++ linux-3.1/arch/arm/mach-omap2/Makefile	2011-10-30 21:14:46.712140689 +0100
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
 @@ -209,6 +209,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= boar
  					   hsmmc.o \
  					   board-flash.o
diff --git a/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch b/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
index 668828ad8..6169215fe 100644
--- a/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/video/omap/dispc.c
-===================================================================
---- linux-3.1.orig/drivers/video/omap/dispc.c	2011-10-30 21:14:30.228268542 +0100
-+++ linux-3.1/drivers/video/omap/dispc.c	2011-10-30 21:14:49.416119695 +0100
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
 @@ -922,14 +922,14 @@ static int get_dss_clocks(void)
  		return PTR_ERR(dispc.dss_ick);
  	}
@@ -19,10 +17,8 @@ Index: linux-3.1/drivers/video/omap/dispc.c
  	if (IS_ERR(dispc.dss_54m_fck)) {
  		dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
  		clk_put(dispc.dss_ick);
-Index: linux-3.1/drivers/video/omap/rfbi.c
-===================================================================
---- linux-3.1.orig/drivers/video/omap/rfbi.c	2011-10-30 21:14:30.220268604 +0100
-+++ linux-3.1/drivers/video/omap/rfbi.c	2011-10-30 21:14:49.416119695 +0100
+--- a/drivers/video/omap/rfbi.c
++++ b/drivers/video/omap/rfbi.c
 @@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
  		return PTR_ERR(rfbi.dss_ick);
  	}
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>
diff --git a/target/linux/omap24xx/patches-3.1/315-n800-touchscreen-and-keypad-drivers.patch b/target/linux/omap24xx/patches-3.1/315-n800-touchscreen-and-keypad-drivers.patch
index bb4a539c5..9fac8663b 100644
--- a/target/linux/omap24xx/patches-3.1/315-n800-touchscreen-and-keypad-drivers.patch
+++ b/target/linux/omap24xx/patches-3.1/315-n800-touchscreen-and-keypad-drivers.patch
@@ -24,10 +24,8 @@ Touchscreen and keypad are fully functional, audio part only provides power mana
  create mode 100644 drivers/spi/tsc2301-mixer.c
  create mode 100644 include/linux/spi/tsc2301.h
 
-Index: linux-3.1/drivers/input/keyboard/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/input/keyboard/Kconfig	2011-10-30 00:48:29.357056963 +0200
-+++ linux-3.1/drivers/input/keyboard/Kconfig	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
 @@ -530,6 +530,12 @@ config KEYBOARD_TNETV107X
  	  To compile this driver as a module, choose M here: the
  	  module will be called tnetv107x-keypad.
@@ -41,10 +39,8 @@ Index: linux-3.1/drivers/input/keyboard/Kconfig
  config KEYBOARD_TWL4030
  	tristate "TI TWL4030/TWL5030/TPS659x0 keypad support"
  	depends on TWL4030_CORE
-Index: linux-3.1/drivers/input/keyboard/Makefile
-===================================================================
---- linux-3.1.orig/drivers/input/keyboard/Makefile	2011-10-30 00:48:29.365056957 +0200
-+++ linux-3.1/drivers/input/keyboard/Makefile	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/input/keyboard/Makefile
++++ b/drivers/input/keyboard/Makefile
 @@ -48,6 +48,7 @@ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd
  obj-$(CONFIG_KEYBOARD_TC3589X)		+= tc3589x-keypad.o
  obj-$(CONFIG_KEYBOARD_TEGRA)		+= tegra-kbc.o
@@ -53,10 +49,8 @@ Index: linux-3.1/drivers/input/keyboard/Makefile
  obj-$(CONFIG_KEYBOARD_TWL4030)		+= twl4030_keypad.o
  obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
  obj-$(CONFIG_KEYBOARD_W90P910)		+= w90p910_keypad.o
-Index: linux-3.1/drivers/input/keyboard/tsc2301_kp.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/input/keyboard/tsc2301_kp.c	2011-10-30 00:48:48.989043470 +0200
+--- /dev/null
++++ b/drivers/input/keyboard/tsc2301_kp.c
 @@ -0,0 +1,475 @@
 +/*
 + * TSC2301 keypad driver
@@ -533,10 +527,8 @@ Index: linux-3.1/drivers/input/keyboard/tsc2301_kp.c
 +
 +	kfree(kp);
 +}
-Index: linux-3.1/drivers/input/touchscreen/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/input/touchscreen/Kconfig	2011-10-30 00:48:29.341056972 +0200
-+++ linux-3.1/drivers/input/touchscreen/Kconfig	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/input/touchscreen/Kconfig
++++ b/drivers/input/touchscreen/Kconfig
 @@ -673,6 +673,12 @@ config TOUCHSCREEN_TSC2007
  	  To compile this driver as a module, choose M here: the
  	  module will be called tsc2007.
@@ -550,10 +542,8 @@ Index: linux-3.1/drivers/input/touchscreen/Kconfig
  config TOUCHSCREEN_W90X900
  	tristate "W90P910 touchscreen driver"
  	depends on HAVE_CLK
-Index: linux-3.1/drivers/input/touchscreen/Makefile
-===================================================================
---- linux-3.1.orig/drivers/input/touchscreen/Makefile	2011-10-30 00:48:29.349056969 +0200
-+++ linux-3.1/drivers/input/touchscreen/Makefile	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/input/touchscreen/Makefile
++++ b/drivers/input/touchscreen/Makefile
 @@ -48,6 +48,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+=
  obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
  obj-$(CONFIG_TOUCHSCREEN_TSC2005)	+= tsc2005.o
@@ -562,10 +552,8 @@ Index: linux-3.1/drivers/input/touchscreen/Makefile
  obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
  obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)	+= wacom_w8001.o
  obj-$(CONFIG_TOUCHSCREEN_WM831X)	+= wm831x-ts.o
-Index: linux-3.1/drivers/input/touchscreen/tsc2301_ts.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/input/touchscreen/tsc2301_ts.c	2011-10-30 00:48:48.989043470 +0200
+--- /dev/null
++++ b/drivers/input/touchscreen/tsc2301_ts.c
 @@ -0,0 +1,676 @@
 +/*
 + * TSC2301 touchscreen driver
@@ -1243,10 +1231,8 @@ Index: linux-3.1/drivers/input/touchscreen/tsc2301_ts.c
 +}
 +MODULE_AUTHOR("Jarkko Oikarinen <jarkko.oikarinen@nokia.com>");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/drivers/spi/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/spi/Kconfig	2011-10-30 00:48:29.373056952 +0200
-+++ linux-3.1/drivers/spi/Kconfig	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
 @@ -435,6 +435,28 @@ config SPI_TLE62X0
  	  sysfs interface, with each line presented as a kind of GPIO
  	  exposing both switch control and diagnostic feedback.
@@ -1276,10 +1262,8 @@ Index: linux-3.1/drivers/spi/Kconfig
  #
  # Add new SPI protocol masters in alphabetical order above this line
  #
-Index: linux-3.1/drivers/spi/Makefile
-===================================================================
---- linux-3.1.orig/drivers/spi/Makefile	2011-10-30 00:48:29.385056944 +0200
-+++ linux-3.1/drivers/spi/Makefile	2011-10-30 00:48:48.989043470 +0200
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
 @@ -59,4 +59,6 @@ obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x
  obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi-topcliff-pch.o
  obj-$(CONFIG_SPI_TXX9)			+= spi-txx9.o
@@ -1288,10 +1272,8 @@ Index: linux-3.1/drivers/spi/Makefile
 +obj-$(CONFIG_SPI_TSC2301)		+= tsc2301.o
 +tsc2301-objs				:= tsc2301-core.o
 +tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)	+= tsc2301-mixer.o
-Index: linux-3.1/drivers/spi/tsc2301-core.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/spi/tsc2301-core.c	2011-10-30 00:48:48.989043470 +0200
+--- /dev/null
++++ b/drivers/spi/tsc2301-core.c
 @@ -0,0 +1,297 @@
 +/*
 + * TSC2301 driver
@@ -1590,10 +1572,8 @@ Index: linux-3.1/drivers/spi/tsc2301-core.c
 +
 +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/drivers/spi/tsc2301-mixer.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/spi/tsc2301-mixer.c	2011-10-30 00:48:48.989043470 +0200
+--- /dev/null
++++ b/drivers/spi/tsc2301-mixer.c
 @@ -0,0 +1,1003 @@
 +/*
 + * ALSA Mixer implementation for TSC2301
@@ -2598,10 +2578,8 @@ Index: linux-3.1/drivers/spi/tsc2301-mixer.c
 +
 +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
 +MODULE_LICENSE("GPL");
-Index: linux-3.1/include/linux/spi/tsc2301.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/include/linux/spi/tsc2301.h	2011-10-30 00:48:48.989043470 +0200
+--- /dev/null
++++ b/include/linux/spi/tsc2301.h
 @@ -0,0 +1,208 @@
 +#ifndef _LINUX_SPI_TSC2301_H
 +#define _LINUX_SPI_TSC2301_H
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 b548b38b5..1c8934814 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>
diff --git a/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch b/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
index 1107fc8c2..553a79124 100644
--- a/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
@@ -8,10 +8,8 @@ This patch adds TSC2301 init logic to N800 board file
  arch/arm/mach-omap2/board-n8x0.c |  141 ++++++++++++++++++++++++++++++++++++--
  1 files changed, 135 insertions(+), 6 deletions(-)
 
-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:32:22.288178756 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c	2011-10-30 19:32:26.840094004 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
 @@ -27,6 +27,7 @@
  #include <linux/spi/tsc2005.h>
  #include <linux/input.h>
diff --git a/target/linux/omap24xx/patches-3.1/350-n8x0-gpioswitch-input.patch b/target/linux/omap24xx/patches-3.1/350-n8x0-gpioswitch-input.patch
index 563a919d4..1a6c2812e 100644
--- a/target/linux/omap24xx/patches-3.1/350-n8x0-gpioswitch-input.patch
+++ b/target/linux/omap24xx/patches-3.1/350-n8x0-gpioswitch-input.patch
@@ -2,10 +2,8 @@
  arch/arm/mach-omap2/board-n8x0.c |   73 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 73 insertions(+)
 
-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 00:48:50.813042079 +0200
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c	2011-10-30 00:48:51.565042059 +0200
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
 @@ -316,6 +316,77 @@ void __init n8x0_bt_init(void)
  		BUG();
  }
diff --git a/target/linux/omap24xx/patches-3.1/400-bluetooth-hci_h4p.patch b/target/linux/omap24xx/patches-3.1/400-bluetooth-hci_h4p.patch
index ea144be0f..408da4a3a 100644
--- a/target/linux/omap24xx/patches-3.1/400-bluetooth-hci_h4p.patch
+++ b/target/linux/omap24xx/patches-3.1/400-bluetooth-hci_h4p.patch
@@ -11,10 +11,8 @@
  drivers/bluetooth/hci_h4p/uart.c    |  169 +++++
  10 files changed, 1891 insertions(+)
 
-Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/core.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/core.c
 @@ -0,0 +1,1043 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1059,10 +1057,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
 +MODULE_DESCRIPTION("h4 driver with nokia extensions");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Ville Tervo");
-Index: linux-3.1/drivers/bluetooth/hci_h4p/fw.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/fw.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/fw.c
 @@ -0,0 +1,155 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1219,10 +1215,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw.c
 +
 +	return;
 +}
-Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/fw-csr.c
 @@ -0,0 +1,149 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1373,10 +1367,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c
 +
 +	return 0;
 +}
-Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/fw-ti.c
 @@ -0,0 +1,90 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1468,10 +1460,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c
 +
 +	return 0;
 +}
-Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/hci_h4p.h
 @@ -0,0 +1,183 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1656,10 +1646,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
 +int hci_h4p_init_uart(struct hci_h4p_info *info);
 +
 +#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */
-Index: linux-3.1/drivers/bluetooth/hci_h4p/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/Makefile	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/Makefile
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the Linux Bluetooth HCI device drivers.
@@ -1668,10 +1656,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/Makefile
 +obj-$(CONFIG_BT_HCIH4P)		+= hci_h4p.o
 +
 +hci_h4p-objs := core.o fw.o uart.o sysfs.o fw-ti.o fw-csr.o
-Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/sysfs.c
 @@ -0,0 +1,84 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1757,10 +1743,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
 +}
 +
 +#endif
-Index: linux-3.1/drivers/bluetooth/hci_h4p/uart.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/bluetooth/hci_h4p/uart.c	2011-10-30 00:48:52.285041210 +0200
+--- /dev/null
++++ b/drivers/bluetooth/hci_h4p/uart.c
 @@ -0,0 +1,169 @@
 +/*
 + * This file is part of hci_h4p bluetooth driver
@@ -1931,10 +1915,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/uart.c
 +
 +	return 0;
 +}
-Index: linux-3.1/drivers/bluetooth/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/bluetooth/Kconfig	2011-10-30 00:48:29.105057133 +0200
-+++ linux-3.1/drivers/bluetooth/Kconfig	2011-10-30 00:48:52.285041210 +0200
+--- a/drivers/bluetooth/Kconfig
++++ b/drivers/bluetooth/Kconfig
 @@ -173,6 +173,16 @@ config BT_HCIBTUART
  	  Say Y here to compile support for HCI UART devices into the
  	  kernel or say M to compile it as module (btuart_cs).
@@ -1952,10 +1934,8 @@ Index: linux-3.1/drivers/bluetooth/Kconfig
  config BT_HCIVHCI
  	tristate "HCI VHCI (Virtual HCI device) driver"
  	help
-Index: linux-3.1/drivers/bluetooth/Makefile
-===================================================================
---- linux-3.1.orig/drivers/bluetooth/Makefile	2011-10-30 00:48:29.141057108 +0200
-+++ linux-3.1/drivers/bluetooth/Makefile	2011-10-30 00:48:52.285041210 +0200
+--- a/drivers/bluetooth/Makefile
++++ b/drivers/bluetooth/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_BT_HCIDTL1)	+= dtl1_cs.o
  obj-$(CONFIG_BT_HCIBT3C)	+= bt3c_cs.o
  obj-$(CONFIG_BT_HCIBLUECARD)	+= bluecard_cs.o
diff --git a/target/linux/omap24xx/patches-3.1/410-hci-h4p-fixes.patch b/target/linux/omap24xx/patches-3.1/410-hci-h4p-fixes.patch
index 651cafe3a..6741511a8 100644
--- a/target/linux/omap24xx/patches-3.1/410-hci-h4p-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/410-hci-h4p-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
-===================================================================
---- linux-3.1.orig/drivers/bluetooth/hci_h4p/core.c	2011-10-30 00:48:52.285041210 +0200
-+++ linux-3.1/drivers/bluetooth/hci_h4p/core.c	2011-10-30 00:48:53.101040400 +0200
+--- a/drivers/bluetooth/hci_h4p/core.c
++++ b/drivers/bluetooth/hci_h4p/core.c
 @@ -36,9 +36,9 @@
  #include <linux/clk.h>
  #include <linux/gpio.h>
@@ -15,10 +13,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
  #include <plat/serial.h>
  
  #include <net/bluetooth/bluetooth.h>
-Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
-===================================================================
---- linux-3.1.orig/drivers/bluetooth/hci_h4p/hci_h4p.h	2011-10-30 00:48:52.285041210 +0200
-+++ linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h	2011-10-30 00:48:53.101040400 +0200
+--- a/drivers/bluetooth/hci_h4p/hci_h4p.h
++++ b/drivers/bluetooth/hci_h4p/hci_h4p.h
 @@ -21,7 +21,7 @@
   *
   */
@@ -28,10 +24,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
  
  #include <net/bluetooth/bluetooth.h>
  #include <net/bluetooth/hci_core.h>
-Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
-===================================================================
---- linux-3.1.orig/drivers/bluetooth/hci_h4p/sysfs.c	2011-10-30 00:48:52.285041210 +0200
-+++ linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c	2011-10-30 00:48:53.101040400 +0200
+--- a/drivers/bluetooth/hci_h4p/sysfs.c
++++ b/drivers/bluetooth/hci_h4p/sysfs.c
 @@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru
  		return -EINVAL;
  	}
diff --git a/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch b/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
index 3aa04adcf..4e7c44018 100644
--- a/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
+++ b/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/arm/mach-omap2/serial.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/serial.c	2011-10-30 00:48:28.997057205 +0200
-+++ linux-3.1/arch/arm/mach-omap2/serial.c	2011-10-30 00:48:53.917039979 +0200
+--- a/arch/arm/mach-omap2/serial.c
++++ b/arch/arm/mach-omap2/serial.c
 @@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o
  		uart->padconf = 0;
  	}
@@ -43,10 +41,8 @@ Index: linux-3.1/arch/arm/mach-omap2/serial.c
  		}
  	}
  }
-Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c	2011-10-30 00:48:29.005057199 +0200
-+++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c	2011-10-30 00:48:53.917039979 +0200
+--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
++++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
 @@ -253,7 +253,7 @@ struct omap_hwmod_irq_info omap2_timer11
  };
  
diff --git a/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch b/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
index 06506941b..a635a8784 100644
--- a/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.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:32:29.896037143 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c	2011-10-30 19:32:32.839982394 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
 @@ -41,6 +41,7 @@
  #include <plat/mmc.h>
  #include <plat/serial.h>
diff --git a/target/linux/omap24xx/patches-3.1/710-evdev-events-without-grab.patch b/target/linux/omap24xx/patches-3.1/710-evdev-events-without-grab.patch
index 4b9a4d35a..b4637595f 100644
--- a/target/linux/omap24xx/patches-3.1/710-evdev-events-without-grab.patch
+++ b/target/linux/omap24xx/patches-3.1/710-evdev-events-without-grab.patch
@@ -2,10 +2,8 @@
  drivers/input/evdev.c |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-Index: linux-3.1/drivers/input/evdev.c
-===================================================================
---- linux-3.1.orig/drivers/input/evdev.c	2011-10-30 00:48:28.025057860 +0200
-+++ linux-3.1/drivers/input/evdev.c	2011-10-30 00:48:55.309039009 +0200
+--- a/drivers/input/evdev.c
++++ b/drivers/input/evdev.c
 @@ -92,7 +92,7 @@ static void evdev_event(struct input_han
  			unsigned int type, unsigned int code, int value)
  {
diff --git a/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
index 97de558b1..81d08c604 100644
--- a/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/mmc/host/omap.c
-===================================================================
---- linux-3.1.orig/drivers/mmc/host/omap.c	2011-10-30 00:48:27.429058258 +0200
-+++ linux-3.1/drivers/mmc/host/omap.c	2011-10-30 00:48:55.981038523 +0200
+--- a/drivers/mmc/host/omap.c
++++ b/drivers/mmc/host/omap.c
 @@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct
  	host->dma_ch = -1;
  
@@ -21,10 +19,8 @@ Index: linux-3.1/drivers/mmc/host/omap.c
  
  	return 0;
  
-Index: linux-3.1/drivers/mmc/core/core.c
-===================================================================
---- linux-3.1.orig/drivers/mmc/core/core.c	2011-10-30 00:48:27.437058255 +0200
-+++ linux-3.1/drivers/mmc/core/core.c	2011-10-30 00:48:55.981038523 +0200
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
 @@ -76,12 +76,13 @@ static int mmc_schedule_delayed_work(str
  }
  
@@ -41,10 +37,8 @@ Index: linux-3.1/drivers/mmc/core/core.c
  
  /**
   *	mmc_request_done - finish processing an MMC request
-Index: linux-3.1/include/linux/mmc/host.h
-===================================================================
---- linux-3.1.orig/include/linux/mmc/host.h	2011-10-30 00:48:27.445058249 +0200
-+++ linux-3.1/include/linux/mmc/host.h	2011-10-30 00:48:55.981038523 +0200
+--- a/include/linux/mmc/host.h
++++ b/include/linux/mmc/host.h
 @@ -394,4 +394,7 @@ static inline int mmc_host_cmd23(struct
  {
  	return host->caps & MMC_CAP_CMD23;
diff --git a/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch b/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
index a19db1adc..d4d4d7c41 100644
--- a/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/arm/mach-omap2/serial.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/serial.c	2011-10-30 00:48:53.917039979 +0200
-+++ linux-3.1/arch/arm/mach-omap2/serial.c	2011-10-30 00:48:57.341037539 +0200
+--- a/arch/arm/mach-omap2/serial.c
++++ b/arch/arm/mach-omap2/serial.c
 @@ -660,6 +660,8 @@ static void serial_out_override(struct u
  }
  #endif
diff --git a/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch b/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
index 2977c5b52..c958989bf 100644
--- a/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/usb/musb/tusb6010.c
-===================================================================
---- linux-3.1.orig/drivers/usb/musb/tusb6010.c	2011-10-30 00:48:24.637060127 +0200
-+++ linux-3.1/drivers/usb/musb/tusb6010.c	2011-10-30 00:48:58.045037045 +0200
+--- a/drivers/usb/musb/tusb6010.c
++++ b/drivers/usb/musb/tusb6010.c
 @@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb)
  
  	return rev;
@@ -52,10 +50,8 @@ Index: linux-3.1/drivers/usb/musb/tusb6010.c
  }
 -module_exit(tusb_exit);
 +EXPORT_SYMBOL(musb_hdrc_glue_exit);
-Index: linux-3.1/drivers/usb/musb/musb_core.c
-===================================================================
---- linux-3.1.orig/drivers/usb/musb/musb_core.c	2011-10-30 00:48:24.629060132 +0200
-+++ linux-3.1/drivers/usb/musb/musb_core.c	2011-10-30 00:48:58.045037045 +0200
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
 @@ -207,7 +207,7 @@ static struct otg_io_access_ops musb_ulp
  
  /*-------------------------------------------------------------------------*/
@@ -123,10 +119,8 @@ Index: linux-3.1/drivers/usb/musb/musb_core.c
 +	musb_hdrc_glue_exit();
  }
  module_exit(musb_cleanup);
-Index: linux-3.1/drivers/usb/Makefile
-===================================================================
---- linux-3.1.orig/drivers/usb/Makefile	2011-10-30 00:48:24.625060136 +0200
-+++ linux-3.1/drivers/usb/Makefile	2011-10-30 00:48:58.045037045 +0200
+--- a/drivers/usb/Makefile
++++ b/drivers/usb/Makefile
 @@ -47,7 +47,7 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP)	+= early
  obj-$(CONFIG_USB_ATM)		+= atm/
  obj-$(CONFIG_USB_SPEEDTOUCH)	+= atm/
@@ -136,10 +130,8 @@ Index: linux-3.1/drivers/usb/Makefile
  obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs/
  obj-$(CONFIG_USB_OTG_UTILS)	+= otg/
  obj-$(CONFIG_USB_GADGET)	+= gadget/
-Index: linux-3.1/drivers/usb/musb/Makefile
-===================================================================
---- linux-3.1.orig/drivers/usb/musb/Makefile	2011-10-30 00:48:24.645060124 +0200
-+++ linux-3.1/drivers/usb/musb/Makefile	2011-10-30 00:48:58.045037045 +0200
+--- a/drivers/usb/musb/Makefile
++++ b/drivers/usb/musb/Makefile
 @@ -13,7 +13,7 @@ musb_hdrc-$(CONFIG_DEBUG_FS)			+= musb_d
  # Hardware Glue Layer
  obj-$(CONFIG_USB_MUSB_OMAP2PLUS)		+= omap2430.o
diff --git a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch
index 3b1f296d4..99c174927 100644
--- a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch
+++ b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/cbus/Kconfig
-===================================================================
---- linux-3.1.orig/drivers/cbus/Kconfig	2011-11-05 17:03:39.578846146 +0100
-+++ linux-3.1/drivers/cbus/Kconfig	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/Kconfig
++++ b/drivers/cbus/Kconfig
 @@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET
  
  endif # CBUS_RETU
@@ -15,10 +13,8 @@ Index: linux-3.1/drivers/cbus/Kconfig
 +	  If unsure, say N.
 +
  endmenu
-Index: linux-3.1/drivers/cbus/Makefile
-===================================================================
---- linux-3.1.orig/drivers/cbus/Makefile	2011-11-05 17:03:39.618846091 +0100
-+++ linux-3.1/drivers/cbus/Makefile	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/Makefile
++++ b/drivers/cbus/Makefile
 @@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r
  obj-$(CONFIG_CBUS_RETU_RTC)	+= retu-rtc.o
  obj-$(CONFIG_CBUS_RETU_WDT)	+= retu-wdt.o
@@ -26,10 +22,8 @@ Index: linux-3.1/drivers/cbus/Makefile
 +n810bm-y			+= n810bm_main.o
 +n810bm-y			+= lipocharge.o
 +obj-$(CONFIG_N810BM)		+= n810bm.o
-Index: linux-3.1/drivers/cbus/n810bm_main.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/n810bm_main.c	2011-11-05 17:06:51.589348749 +0100
+--- /dev/null
++++ b/drivers/cbus/n810bm_main.c
 @@ -0,0 +1,1572 @@
 +/*
 + *   Nokia n810 battery management
@@ -1603,10 +1597,8 @@ Index: linux-3.1/drivers/cbus/n810bm_main.c
 +MODULE_FIRMWARE(N810BM_PMM_BLOCK_FILENAME);
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Michael Buesch");
-Index: linux-3.1/drivers/cbus/lipocharge.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/lipocharge.c	2011-11-05 17:06:51.589348749 +0100
+--- /dev/null
++++ b/drivers/cbus/lipocharge.c
 @@ -0,0 +1,183 @@
 +/*
 + *   Generic LIPO battery charger
@@ -1791,10 +1783,8 @@ Index: linux-3.1/drivers/cbus/lipocharge.c
 +
 +	return 0;
 +}
-Index: linux-3.1/drivers/cbus/lipocharge.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/drivers/cbus/lipocharge.h	2011-11-05 17:06:51.589348749 +0100
+--- /dev/null
++++ b/drivers/cbus/lipocharge.h
 @@ -0,0 +1,60 @@
 +#ifndef LIPOCHARGE_H_
 +#define LIPOCHARGE_H_
@@ -1856,10 +1846,8 @@ Index: linux-3.1/drivers/cbus/lipocharge.h
 +}
 +
 +#endif /* LIPOCHARGE_H_ */
-Index: linux-3.1/drivers/cbus/cbus.c
-===================================================================
---- linux-3.1.orig/drivers/cbus/cbus.c	2011-11-05 17:03:39.610846102 +0100
-+++ linux-3.1/drivers/cbus/cbus.c	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/cbus.c
++++ b/drivers/cbus/cbus.c
 @@ -34,6 +34,7 @@
  #include <linux/gpio.h>
  #include <linux/platform_device.h>
@@ -1882,10 +1870,8 @@ Index: linux-3.1/drivers/cbus/cbus.c
  MODULE_DESCRIPTION("CBUS serial protocol");
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Juha Yrjölä");
-Index: linux-3.1/drivers/cbus/cbus.h
-===================================================================
---- linux-3.1.orig/drivers/cbus/cbus.h	2011-11-05 17:03:39.590846131 +0100
-+++ linux-3.1/drivers/cbus/cbus.h	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/cbus.h
++++ b/drivers/cbus/cbus.h
 @@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device *
  extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg,
  		unsigned val);
@@ -1893,10 +1879,8 @@ Index: linux-3.1/drivers/cbus/cbus.h
 +NORET_TYPE void cbus_emergency(void) ATTRIB_NORET;
 +
  #endif /* __DRIVERS_CBUS_CBUS_H */
-Index: linux-3.1/drivers/cbus/retu.c
-===================================================================
---- linux-3.1.orig/drivers/cbus/retu.c	2011-11-05 17:03:39.606846106 +0100
-+++ linux-3.1/drivers/cbus/retu.c	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/retu.c
++++ b/drivers/cbus/retu.c
 @@ -417,6 +417,11 @@ static int retu_allocate_children(struct
  	if (!child)
  		return -ENOMEM;
@@ -1909,10 +1893,8 @@ Index: linux-3.1/drivers/cbus/retu.c
  	return 0;
  }
  
-Index: linux-3.1/drivers/cbus/tahvo.c
-===================================================================
---- linux-3.1.orig/drivers/cbus/tahvo.c	2011-11-05 17:04:36.274768324 +0100
-+++ linux-3.1/drivers/cbus/tahvo.c	2011-11-05 17:06:51.589348749 +0100
+--- a/drivers/cbus/tahvo.c
++++ b/drivers/cbus/tahvo.c
 @@ -131,6 +131,7 @@ void tahvo_set_clear_reg_bits(struct dev
  	__tahvo_write_reg(tahvo, reg, w);
  	mutex_unlock(&tahvo->mutex);