diff options
| author | Michael Büsch <mb@bu3sch.de> | 2011-10-29 22:52:07 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2011-10-29 22:52:07 +0000 |
| commit | ba9ee13744548909b767ab4dcc71dc0eb00433b7 (patch) | |
| tree | 471dfd149ad0b82f14ca849f9ad0214b4a0dcbf8 /target/linux/omap24xx | |
| parent | e184bfe6f044b886297ef7b7133079cafcb7d5af (diff) | |
| download | upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.gz upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.bz2 upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.zip | |
omap24xx: Refresh 3.1 patches
SVN-Revision: 28676
Diffstat (limited to 'target/linux/omap24xx')
19 files changed, 233 insertions, 207 deletions
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 94c90cba6b..92869bb00c 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,7 @@ -Index: linux-3.1-rc4/arch/arm/plat-omap/bootreason.c +Index: linux-3.1/arch/arm/plat-omap/bootreason.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/arch/arm/plat-omap/bootreason.c 2011-10-27 19:30:06.790989882 +0200 ++++ linux-3.1/arch/arm/plat-omap/bootreason.c 2011-10-30 00:48:34.877053219 +0200 @@ -0,0 +1,79 @@ +/* + * linux/arch/arm/plat-omap/bootreason.c @@ -82,10 +82,10 @@ Index: linux-3.1-rc4/arch/arm/plat-omap/bootreason.c +} + +late_initcall(bootreason_init); -Index: linux-3.1-rc4/arch/arm/plat-omap/common.c +Index: linux-3.1/arch/arm/plat-omap/common.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/common.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/common.c 2011-10-27 19:30:06.790989882 +0200 +--- 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 @@ -21,18 +21,90 @@ #include <plat/vram.h> #include <plat/dsp.h> @@ -177,10 +177,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/plat-omap/component-version.c +Index: linux-3.1/arch/arm/plat-omap/component-version.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/arch/arm/plat-omap/component-version.c 2011-10-27 19:30:06.790989882 +0200 ++++ linux-3.1/arch/arm/plat-omap/component-version.c 2011-10-30 00:48:34.877053219 +0200 @@ -0,0 +1,64 @@ +/* + * linux/arch/arm/plat-omap/component-version.c @@ -246,10 +246,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/plat-omap/Kconfig +Index: linux-3.1/arch/arm/plat-omap/Kconfig =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/Kconfig 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/Kconfig 2011-10-27 19:30:06.790989882 +0200 +--- 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 @@ -82,6 +82,38 @@ config OMAP_RESET_CLOCKS probably do not want this option enabled until your device drivers work properly. @@ -289,10 +289,10 @@ Index: linux-3.1-rc4/arch/arm/plat-omap/Kconfig config OMAP_MUX bool "OMAP multiplexing support" depends on ARCH_OMAP -Index: linux-3.1-rc4/arch/arm/plat-omap/Makefile +Index: linux-3.1/arch/arm/plat-omap/Makefile =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/Makefile 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/Makefile 2011-10-27 19:30:06.790989882 +0200 +--- 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 @@ -23,6 +23,9 @@ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu- obj-$(CONFIG_CPU_FREQ) += cpu-omap.o @@ -303,10 +303,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/include/asm/setup.h +Index: linux-3.1/arch/arm/include/asm/setup.h =================================================================== ---- linux-3.1-rc4.orig/arch/arm/include/asm/setup.h 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/include/asm/setup.h 2011-10-27 19:30:06.790989882 +0200 +--- 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 @@ -136,6 +136,13 @@ struct tag_acorn { __u8 adfsdrives; }; @@ -333,10 +333,10 @@ Index: linux-3.1-rc4/arch/arm/include/asm/setup.h * DC21285 specific */ struct tag_memclk memclk; -Index: linux-3.1-rc4/arch/arm/plat-omap/gpio-switch.c +Index: linux-3.1/arch/arm/plat-omap/gpio-switch.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/arch/arm/plat-omap/gpio-switch.c 2011-10-27 21:23:03.726610115 +0200 ++++ linux-3.1/arch/arm/plat-omap/gpio-switch.c 2011-10-30 00:48:34.877053219 +0200 @@ -0,0 +1,554 @@ +/* + * linux/arch/arm/plat-omap/gpio-switch.c @@ -892,10 +892,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/plat-omap/include/plat/board.h +Index: linux-3.1/arch/arm/plat-omap/include/plat/board.h =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/include/plat/board.h 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/include/plat/board.h 2011-10-27 19:30:06.790989882 +0200 +--- 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 @@ -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 a226bd9452..bb7a6c9849 100644 --- a/target/linux/omap24xx/patches-3.1/250-cbus.patch +++ b/target/linux/omap24xx/patches-3.1/250-cbus.patch @@ -1,7 +1,7 @@ -Index: linux-3.1-rc4/drivers/cbus/cbus.c +Index: linux-3.1/drivers/cbus/cbus.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/cbus.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,333 @@ +/* + * drivers/cbus/cbus.c @@ -336,10 +336,10 @@ Index: linux-3.1-rc4/drivers/cbus/cbus.c +MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); + -Index: linux-3.1-rc4/drivers/cbus/cbus.h +Index: linux-3.1/drivers/cbus/cbus.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/cbus.h 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,30 @@ +/* + * drivers/cbus/cbus.h @@ -371,10 +371,10 @@ Index: linux-3.1-rc4/drivers/cbus/cbus.h + unsigned val); + +#endif /* __DRIVERS_CBUS_CBUS_H */ -Index: linux-3.1-rc4/drivers/cbus/Kconfig +Index: linux-3.1/drivers/cbus/Kconfig =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/Kconfig 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,86 @@ +# +# CBUS device configuration @@ -462,10 +462,10 @@ Index: linux-3.1-rc4/drivers/cbus/Kconfig +endif # CBUS_RETU + +endmenu -Index: linux-3.1-rc4/drivers/cbus/Makefile +Index: linux-3.1/drivers/cbus/Makefile =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/Makefile 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/Makefile 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,13 @@ +# +# Makefile for CBUS. @@ -480,10 +480,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/cbus/retu.c +Index: linux-3.1/drivers/cbus/retu.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,549 @@ +/** + * drivers/cbus/retu.c @@ -1034,10 +1034,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu.c +MODULE_AUTHOR("Juha Yrjölä"); +MODULE_AUTHOR("David Weinehall"); +MODULE_AUTHOR("Mikko Ylinen"); -Index: linux-3.1-rc4/drivers/cbus/retu.h +Index: linux-3.1/drivers/cbus/retu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu.h 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu.h 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,85 @@ +/** + * drivers/cbus/retu.h @@ -1124,10 +1124,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu.h +int retu_read_adc(struct device *child, int channel); + +#endif /* __DRIVERS_CBUS_RETU_H */ -Index: linux-3.1-rc4/drivers/cbus/retu-headset.c +Index: linux-3.1/drivers/cbus/retu-headset.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu-headset.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu-headset.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,359 @@ +/** + * Retu/Vilma headset detection @@ -1488,10 +1488,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu-headset.c +MODULE_DESCRIPTION("Retu/Vilma headset detection"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä"); -Index: linux-3.1-rc4/drivers/cbus/retu-pwrbutton.c +Index: linux-3.1/drivers/cbus/retu-pwrbutton.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu-pwrbutton.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu-pwrbutton.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,165 @@ +/** + * drivers/cbus/retu-pwrbutton.c @@ -1658,10 +1658,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu-pwrbutton.c +MODULE_AUTHOR("Ari Saastamoinen"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); + -Index: linux-3.1-rc4/drivers/cbus/retu-rtc.c +Index: linux-3.1/drivers/cbus/retu-rtc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu-rtc.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu-rtc.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,287 @@ +/** + * drivers/cbus/retu-rtc.c @@ -1950,10 +1950,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu-rtc.c +MODULE_AUTHOR("Igor Stoppa"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); + -Index: linux-3.1-rc4/drivers/cbus/retu-wdt.c +Index: linux-3.1/drivers/cbus/retu-wdt.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/retu-wdt.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/retu-wdt.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,272 @@ +/** + * drivers/cbus/retu-wdt.c @@ -2227,10 +2227,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu-wdt.c +MODULE_DESCRIPTION("Retu WatchDog"); +MODULE_AUTHOR("Amit Kucheria"); +MODULE_LICENSE("GPL"); -Index: linux-3.1-rc4/drivers/cbus/tahvo.c +Index: linux-3.1/drivers/cbus/tahvo.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/tahvo.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,423 @@ +/** + * drivers/cbus/tahvo.c @@ -2655,10 +2655,10 @@ Index: linux-3.1-rc4/drivers/cbus/tahvo.c +MODULE_AUTHOR("David Weinehall"); +MODULE_AUTHOR("Mikko Ylinen"); + -Index: linux-3.1-rc4/drivers/cbus/tahvo.h +Index: linux-3.1/drivers/cbus/tahvo.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/tahvo.h 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/tahvo.h 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,58 @@ +/* + * drivers/cbus/tahvo.h @@ -2718,10 +2718,10 @@ Index: linux-3.1-rc4/drivers/cbus/tahvo.h + u16 clear); + +#endif /* __DRIVERS_CBUS_TAHVO_H */ -Index: linux-3.1-rc4/drivers/cbus/tahvo-usb.c +Index: linux-3.1/drivers/cbus/tahvo-usb.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/tahvo-usb.c 2011-10-27 23:56:44.917514371 +0200 ++++ linux-3.1/drivers/cbus/tahvo-usb.c 2011-10-30 00:48:42.989047642 +0200 @@ -0,0 +1,740 @@ +/** + * drivers/cbus/tahvo-usb.c @@ -3463,10 +3463,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/Makefile +Index: linux-3.1/drivers/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/Makefile 2011-10-27 23:56:12.861639678 +0200 -+++ linux-3.1-rc4/drivers/Makefile 2011-10-27 23:56:44.917514371 +0200 +--- 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 @@ -76,7 +76,7 @@ obj-$(CONFIG_GAMEPORT) += input/gamepor obj-$(CONFIG_INPUT) += input/ obj-$(CONFIG_I2O) += message/ @@ -3476,10 +3476,10 @@ Index: linux-3.1-rc4/drivers/Makefile obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ obj-$(CONFIG_W1) += w1/ -Index: linux-3.1-rc4/drivers/Kconfig +Index: linux-3.1/drivers/Kconfig =================================================================== ---- linux-3.1-rc4.orig/drivers/Kconfig 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/drivers/Kconfig 2011-10-27 23:57:05.977432050 +0200 +--- 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 @@ -2,6 +2,8 @@ menu "Device Drivers" source "drivers/base/Kconfig" diff --git a/target/linux/omap24xx/patches-3.1/260-cbus-port.patch b/target/linux/omap24xx/patches-3.1/260-cbus-port.patch index a9e57597f1..f5eb1790a5 100644 --- a/target/linux/omap24xx/patches-3.1/260-cbus-port.patch +++ b/target/linux/omap24xx/patches-3.1/260-cbus-port.patch @@ -1,7 +1,7 @@ -Index: linux-3.1-rc4/drivers/cbus/cbus.c +Index: linux-3.1/drivers/cbus/cbus.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/cbus.c 2011-10-29 20:45:09.335547837 +0200 -+++ linux-3.1-rc4/drivers/cbus/cbus.c 2011-10-29 20:47:55.399163717 +0200 +--- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:46.413045272 +0200 @@ -33,7 +33,7 @@ #include <linux/spinlock.h> #include <linux/gpio.h> @@ -11,10 +11,10 @@ Index: linux-3.1-rc4/drivers/cbus/cbus.c #include "cbus.h" -Index: linux-3.1-rc4/drivers/cbus/retu.c +Index: linux-3.1/drivers/cbus/retu.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/retu.c 2011-10-29 20:47:55.395163726 +0200 -+++ linux-3.1-rc4/drivers/cbus/retu.c 2011-10-29 20:48:32.463078350 +0200 +--- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:46.413045272 +0200 @@ -34,7 +34,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> @@ -24,10 +24,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu.c #include <asm/bitops.h> -Index: linux-3.1-rc4/drivers/cbus/tahvo.c +Index: linux-3.1/drivers/cbus/tahvo.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/tahvo.c 2011-10-29 20:47:55.383163754 +0200 -+++ linux-3.1-rc4/drivers/cbus/tahvo.c 2011-10-29 20:49:01.375011851 +0200 +--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:46.413045272 +0200 @@ -33,7 +33,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> 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 567e4c6f19..7049b4d486 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:03.620973158 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:48.268866718 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:29.505056863 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:47.357044479 +0200 @@ -15,8 +15,10 @@ #include <linux/delay.h> #include <linux/gpio.h> @@ -145,10 +145,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/plat-omap/include/plat/irqs.h +Index: linux-3.1/arch/arm/plat-omap/include/plat/irqs.h =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-10-29 20:35:01.620977933 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/include/plat/irqs.h 2011-10-29 20:35:48.268866718 +0200 +--- linux-3.1.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:29.517056855 +0200 ++++ linux-3.1/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:47.357044479 +0200 @@ -428,8 +428,16 @@ #define OMAP_GPMC_NR_IRQS 8 #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS) 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 a9f95be21a..780a1a1142 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:49:08.122996341 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:57:46.528713116 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:47.357044479 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:48.205044041 +0200 @@ -23,6 +23,7 @@ #include <linux/spi/spi.h> #include <linux/usb/musb.h> @@ -124,10 +124,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c gpmc_onenand_init(board_onenand_data); n8x0_mmc_init(); n8x0_usb_init(); -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0-lcd.c +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-rc4/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-29 20:58:54.648257704 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 00:48:48.205044041 +0200 @@ -0,0 +1,140 @@ +/* + * linux/arch/arm/mach-omap2/board-n8x0.c @@ -269,10 +269,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0-lcd.c + + printk(KERN_INFO "N8x0 Blizzard initialized"); +} -Index: linux-3.1-rc4/arch/arm/mach-omap2/Makefile +Index: linux-3.1/arch/arm/mach-omap2/Makefile =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/Makefile 2011-10-29 20:47:55.923162509 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/Makefile 2011-10-29 20:49:08.130996323 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/Makefile 2011-10-30 00:48:29.461056893 +0200 ++++ linux-3.1/arch/arm/mach-omap2/Makefile 2011-10-30 00:48:48.205044041 +0200 @@ -209,6 +209,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar hsmmc.o \ board-flash.o @@ -281,10 +281,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/Makefile obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o \ sdram-nokia.o \ hsmmc.o -Index: linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2420_data.c +Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2420_data.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-29 20:47:55.903162555 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-29 20:49:08.130996323 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 00:48:29.441056907 +0200 ++++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 00:48:48.205044041 +0200 @@ -1181,6 +1181,7 @@ static struct omap_hwmod_ocp_if *omap242 static struct omap_hwmod omap2420_gpio1_hwmod = { 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 8366566bc2..bb4a539c57 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,10 @@ 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-rc4/drivers/input/keyboard/Kconfig +Index: linux-3.1/drivers/input/keyboard/Kconfig =================================================================== ---- linux-3.1-rc4.orig/drivers/input/keyboard/Kconfig 2011-10-29 22:14:01.548849676 +0200 -+++ linux-3.1-rc4/drivers/input/keyboard/Kconfig 2011-10-29 22:14:10.444812519 +0200 +--- 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 @@ -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 +41,10 @@ Index: linux-3.1-rc4/drivers/input/keyboard/Kconfig config KEYBOARD_TWL4030 tristate "TI TWL4030/TWL5030/TPS659x0 keypad support" depends on TWL4030_CORE -Index: linux-3.1-rc4/drivers/input/keyboard/Makefile +Index: linux-3.1/drivers/input/keyboard/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/input/keyboard/Makefile 2011-10-29 22:14:01.560849628 +0200 -+++ linux-3.1-rc4/drivers/input/keyboard/Makefile 2011-10-29 22:14:10.444812519 +0200 +--- 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 @@ -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 +53,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/input/keyboard/tsc2301_kp.c +Index: linux-3.1/drivers/input/keyboard/tsc2301_kp.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/input/keyboard/tsc2301_kp.c 2011-10-29 22:27:48.875046931 +0200 ++++ linux-3.1/drivers/input/keyboard/tsc2301_kp.c 2011-10-30 00:48:48.989043470 +0200 @@ -0,0 +1,475 @@ +/* + * TSC2301 keypad driver @@ -533,10 +533,10 @@ Index: linux-3.1-rc4/drivers/input/keyboard/tsc2301_kp.c + + kfree(kp); +} -Index: linux-3.1-rc4/drivers/input/touchscreen/Kconfig +Index: linux-3.1/drivers/input/touchscreen/Kconfig =================================================================== ---- linux-3.1-rc4.orig/drivers/input/touchscreen/Kconfig 2011-10-29 22:14:01.532849745 +0200 -+++ linux-3.1-rc4/drivers/input/touchscreen/Kconfig 2011-10-29 22:14:10.444812519 +0200 +--- 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 @@ -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 +550,10 @@ Index: linux-3.1-rc4/drivers/input/touchscreen/Kconfig config TOUCHSCREEN_W90X900 tristate "W90P910 touchscreen driver" depends on HAVE_CLK -Index: linux-3.1-rc4/drivers/input/touchscreen/Makefile +Index: linux-3.1/drivers/input/touchscreen/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/input/touchscreen/Makefile 2011-10-29 22:14:01.544849693 +0200 -+++ linux-3.1-rc4/drivers/input/touchscreen/Makefile 2011-10-29 22:14:10.444812519 +0200 +--- 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 @@ -48,6 +48,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o @@ -562,10 +562,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/input/touchscreen/tsc2301_ts.c +Index: linux-3.1/drivers/input/touchscreen/tsc2301_ts.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/input/touchscreen/tsc2301_ts.c 2011-10-29 22:29:36.693801882 +0200 ++++ linux-3.1/drivers/input/touchscreen/tsc2301_ts.c 2011-10-30 00:48:48.989043470 +0200 @@ -0,0 +1,676 @@ +/* + * TSC2301 touchscreen driver @@ -1243,10 +1243,10 @@ Index: linux-3.1-rc4/drivers/input/touchscreen/tsc2301_ts.c +} +MODULE_AUTHOR("Jarkko Oikarinen <jarkko.oikarinen@nokia.com>"); +MODULE_LICENSE("GPL"); -Index: linux-3.1-rc4/drivers/spi/Kconfig +Index: linux-3.1/drivers/spi/Kconfig =================================================================== ---- linux-3.1-rc4.orig/drivers/spi/Kconfig 2011-10-29 22:14:10.260813287 +0200 -+++ linux-3.1-rc4/drivers/spi/Kconfig 2011-10-29 22:14:10.448812502 +0200 +--- 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 @@ -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 +1276,10 @@ Index: linux-3.1-rc4/drivers/spi/Kconfig # # Add new SPI protocol masters in alphabetical order above this line # -Index: linux-3.1-rc4/drivers/spi/Makefile +Index: linux-3.1/drivers/spi/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/spi/Makefile 2011-10-29 22:14:10.260813287 +0200 -+++ linux-3.1-rc4/drivers/spi/Makefile 2011-10-29 22:14:10.448812502 +0200 +--- 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 @@ -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 +1288,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/spi/tsc2301-core.c +Index: linux-3.1/drivers/spi/tsc2301-core.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/spi/tsc2301-core.c 2011-10-29 22:14:10.448812502 +0200 ++++ linux-3.1/drivers/spi/tsc2301-core.c 2011-10-30 00:48:48.989043470 +0200 @@ -0,0 +1,297 @@ +/* + * TSC2301 driver @@ -1590,10 +1590,10 @@ Index: linux-3.1-rc4/drivers/spi/tsc2301-core.c + +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>"); +MODULE_LICENSE("GPL"); -Index: linux-3.1-rc4/drivers/spi/tsc2301-mixer.c +Index: linux-3.1/drivers/spi/tsc2301-mixer.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/spi/tsc2301-mixer.c 2011-10-29 22:14:10.448812502 +0200 ++++ linux-3.1/drivers/spi/tsc2301-mixer.c 2011-10-30 00:48:48.989043470 +0200 @@ -0,0 +1,1003 @@ +/* + * ALSA Mixer implementation for TSC2301 @@ -2598,10 +2598,10 @@ Index: linux-3.1-rc4/drivers/spi/tsc2301-mixer.c + +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); +MODULE_LICENSE("GPL"); -Index: linux-3.1-rc4/include/linux/spi/tsc2301.h +Index: linux-3.1/include/linux/spi/tsc2301.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/include/linux/spi/tsc2301.h 2011-10-29 22:14:10.448812502 +0200 ++++ linux-3.1/include/linux/spi/tsc2301.h 2011-10-30 00:48:48.989043470 +0200 @@ -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 7a73d34925..5f1d06304c 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:57.228845384 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:58.476842416 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:48.205044041 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:49.837042881 +0200 @@ -24,6 +24,8 @@ #include <linux/usb/musb.h> #include <sound/tlv320aic3x.h> @@ -194,10 +194,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c /* FIXME: add n810 spi devices */ tsc2005_set_config(); -Index: linux-3.1-rc4/arch/arm/plat-omap/include/plat/cbus.h +Index: linux-3.1/arch/arm/plat-omap/include/plat/cbus.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/arch/arm/plat-omap/include/plat/cbus.h 2011-10-29 20:35:58.476842416 +0200 ++++ linux-3.1/arch/arm/plat-omap/include/plat/cbus.h 2011-10-30 00:48:49.837042881 +0200 @@ -0,0 +1,40 @@ +/* + * cbus.h - CBUS platform_data definition 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 bb95774cc9..4998fcdbde 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,10 @@ 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-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:14:18.752777837 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:16:59.040112725 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:49.837042881 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:50.813042079 +0200 @@ -26,6 +26,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 2be9bda106..563a919d4f 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,10 @@ arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:14:20.380771042 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:14:21.212767573 +0200 +--- 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 @@ -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 408da4a3a0..ea144be0f3 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,8 +11,10 @@ drivers/bluetooth/hci_h4p/uart.c | 169 +++++ 10 files changed, 1891 insertions(+) ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/core.c +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 @@ -0,0 +1,1043 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1057,8 +1059,10 @@ +MODULE_DESCRIPTION("h4 driver with nokia extensions"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Ville Tervo"); ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/fw.c +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 @@ -0,0 +1,155 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1215,8 +1219,10 @@ + + return; +} ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/fw-csr.c +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 @@ -0,0 +1,149 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1367,8 +1373,10 @@ + + return 0; +} ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/fw-ti.c +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 @@ -0,0 +1,90 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1460,8 +1468,10 @@ + + return 0; +} ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/hci_h4p.h +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 @@ -0,0 +1,183 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1646,8 +1656,10 @@ +int hci_h4p_init_uart(struct hci_h4p_info *info); + +#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */ ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/Makefile +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 @@ -0,0 +1,7 @@ +# +# Makefile for the Linux Bluetooth HCI device drivers. @@ -1656,8 +1668,10 @@ +obj-$(CONFIG_BT_HCIH4P) += hci_h4p.o + +hci_h4p-objs := core.o fw.o uart.o sysfs.o fw-ti.o fw-csr.o ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/sysfs.c +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 @@ -0,0 +1,84 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1743,8 +1757,10 @@ +} + +#endif ---- /dev/null -+++ b/drivers/bluetooth/hci_h4p/uart.c +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 @@ -0,0 +1,169 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -1915,8 +1931,10 @@ + + return 0; +} ---- a/drivers/bluetooth/Kconfig -+++ b/drivers/bluetooth/Kconfig +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 @@ -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). @@ -1934,8 +1952,10 @@ config BT_HCIVHCI tristate "HCI VHCI (Virtual HCI device) driver" help ---- a/drivers/bluetooth/Makefile -+++ b/drivers/bluetooth/Makefile +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 @@ -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 6741511a88..651cafe3ae 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,5 +1,7 @@ ---- a/drivers/bluetooth/hci_h4p/core.c -+++ b/drivers/bluetooth/hci_h4p/core.c +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 @@ -36,9 +36,9 @@ #include <linux/clk.h> #include <linux/gpio.h> @@ -13,8 +15,10 @@ #include <plat/serial.h> #include <net/bluetooth/bluetooth.h> ---- a/drivers/bluetooth/hci_h4p/hci_h4p.h -+++ b/drivers/bluetooth/hci_h4p/hci_h4p.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 @@ -21,7 +21,7 @@ * */ @@ -24,8 +28,10 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> ---- a/drivers/bluetooth/hci_h4p/sysfs.c -+++ b/drivers/bluetooth/hci_h4p/sysfs.c +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 @@ -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 6eb9569891..3aa04adcf0 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c +Index: linux-3.1/arch/arm/mach-omap2/serial.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/serial.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/serial.c 2011-10-27 16:38:20.539265654 +0200 +--- 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 @@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o uart->padconf = 0; } @@ -43,10 +43,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c } } } -Index: linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c 2011-10-27 16:44:39.065885130 +0200 +--- 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 @@ -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 bf3205ac85..36cef73d1a 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:14:21.212767573 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 22:14:26.076747281 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:51.565042059 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:54.637039450 +0200 @@ -41,6 +41,7 @@ #include <plat/serial.h> #include <plat/cbus.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 cf14e474cb..4b9a4d35ac 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,10 @@ drivers/input/evdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -Index: linux-3.1-rc4/drivers/input/evdev.c +Index: linux-3.1/drivers/input/evdev.c =================================================================== ---- linux-3.1-rc4.orig/drivers/input/evdev.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/drivers/input/evdev.c 2011-10-27 16:47:54.773182635 +0200 +--- 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 @@ -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 27709688b2..97de558b12 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,7 @@ -Index: linux-3.1-rc4/drivers/mmc/host/omap.c +Index: linux-3.1/drivers/mmc/host/omap.c =================================================================== ---- linux-3.1-rc4.orig/drivers/mmc/host/omap.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/drivers/mmc/host/omap.c 2011-10-27 16:48:04.389148259 +0200 +--- 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 @@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct host->dma_ch = -1; @@ -21,10 +21,10 @@ Index: linux-3.1-rc4/drivers/mmc/host/omap.c return 0; -Index: linux-3.1-rc4/drivers/mmc/core/core.c +Index: linux-3.1/drivers/mmc/core/core.c =================================================================== ---- linux-3.1-rc4.orig/drivers/mmc/core/core.c 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/drivers/mmc/core/core.c 2011-10-27 16:48:04.389148259 +0200 +--- 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 @@ -76,12 +76,13 @@ static int mmc_schedule_delayed_work(str } @@ -41,10 +41,10 @@ Index: linux-3.1-rc4/drivers/mmc/core/core.c /** * mmc_request_done - finish processing an MMC request -Index: linux-3.1-rc4/include/linux/mmc/host.h +Index: linux-3.1/include/linux/mmc/host.h =================================================================== ---- linux-3.1-rc4.orig/include/linux/mmc/host.h 2011-08-29 06:16:01.000000000 +0200 -+++ linux-3.1-rc4/include/linux/mmc/host.h 2011-10-27 16:49:05.240930665 +0200 +--- 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 @@ -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/820-backlight-fixes.patch b/target/linux/omap24xx/patches-3.1/820-backlight-fixes.patch index 2103fe27d2..fb6393af59 100644 --- a/target/linux/omap24xx/patches-3.1/820-backlight-fixes.patch +++ b/target/linux/omap24xx/patches-3.1/820-backlight-fixes.patch @@ -2,10 +2,10 @@ arch/arm/mach-omap2/board-n8x0-lcd.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0-lcd.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-29 22:14:15.792790191 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-29 22:14:29.864731483 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 00:48:48.205044041 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 00:48:56.685038042 +0200 @@ -33,8 +33,28 @@ static void mipid_shutdown(struct mipid_ } } 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 b423114c96..a19db1adc8 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,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c +Index: linux-3.1/arch/arm/mach-omap2/serial.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/serial.c 2011-10-27 16:38:20.000000000 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/serial.c 2011-10-27 16:53:53.831807619 +0200 +--- 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 @@ -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 0ad0209f63..2977c5b522 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,7 @@ -Index: linux-3.1-rc4/drivers/usb/musb/tusb6010.c +Index: linux-3.1/drivers/usb/musb/tusb6010.c =================================================================== ---- linux-3.1-rc4.orig/drivers/usb/musb/tusb6010.c 2011-10-30 00:12:03.951809040 +0200 -+++ linux-3.1-rc4/drivers/usb/musb/tusb6010.c 2011-10-30 00:12:06.543770526 +0200 +--- 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 @@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb) return rev; @@ -52,10 +52,10 @@ Index: linux-3.1-rc4/drivers/usb/musb/tusb6010.c } -module_exit(tusb_exit); +EXPORT_SYMBOL(musb_hdrc_glue_exit); -Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c +Index: linux-3.1/drivers/usb/musb/musb_core.c =================================================================== ---- linux-3.1-rc4.orig/drivers/usb/musb/musb_core.c 2011-10-30 00:12:03.943809160 +0200 -+++ linux-3.1-rc4/drivers/usb/musb/musb_core.c 2011-10-30 00:20:44.156218000 +0200 +--- 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 @@ -207,7 +207,7 @@ static struct otg_io_access_ops musb_ulp /*-------------------------------------------------------------------------*/ @@ -123,10 +123,10 @@ Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c + musb_hdrc_glue_exit(); } module_exit(musb_cleanup); -Index: linux-3.1-rc4/drivers/usb/Makefile +Index: linux-3.1/drivers/usb/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/usb/Makefile 2011-10-30 00:12:03.939809220 +0200 -+++ linux-3.1-rc4/drivers/usb/Makefile 2011-10-30 00:12:06.543770526 +0200 +--- 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 @@ -47,7 +47,7 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP) += early obj-$(CONFIG_USB_ATM) += atm/ obj-$(CONFIG_USB_SPEEDTOUCH) += atm/ @@ -136,10 +136,10 @@ Index: linux-3.1-rc4/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-rc4/drivers/usb/musb/Makefile +Index: linux-3.1/drivers/usb/musb/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/usb/musb/Makefile 2011-10-30 00:11:34.852241963 +0200 -+++ linux-3.1-rc4/drivers/usb/musb/Makefile 2011-10-30 00:14:52.945312862 +0200 +--- 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 @@ -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 4c4e46e2b2..3d90ebd767 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,7 @@ -Index: linux-3.1-rc4/drivers/cbus/Kconfig +Index: linux-3.1/drivers/cbus/Kconfig =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/Kconfig 2011-10-29 20:45:09.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/Kconfig 2011-10-29 20:46:00.683428775 +0200 +--- linux-3.1.orig/drivers/cbus/Kconfig 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 00:48:58.765036552 +0200 @@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET endif # CBUS_RETU @@ -15,10 +15,10 @@ Index: linux-3.1-rc4/drivers/cbus/Kconfig + If unsure, say N. + endmenu -Index: linux-3.1-rc4/drivers/cbus/Makefile +Index: linux-3.1/drivers/cbus/Makefile =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/Makefile 2011-10-29 20:45:09.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/Makefile 2011-10-29 20:46:00.683428775 +0200 +--- linux-3.1.orig/drivers/cbus/Makefile 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/Makefile 2011-10-30 00:48:58.765036552 +0200 @@ -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 +26,10 @@ Index: linux-3.1-rc4/drivers/cbus/Makefile +n810bm-y += n810bm_main.o +n810bm-y += lipocharge.o +obj-$(CONFIG_N810BM) += n810bm.o -Index: linux-3.1-rc4/drivers/cbus/n810bm_main.c +Index: linux-3.1/drivers/cbus/n810bm_main.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/n810bm_main.c 2011-10-29 20:46:00.683428775 +0200 ++++ linux-3.1/drivers/cbus/n810bm_main.c 2011-10-30 00:48:58.765036552 +0200 @@ -0,0 +1,1586 @@ +/* + * Nokia n810 battery management @@ -1617,10 +1617,10 @@ Index: linux-3.1-rc4/drivers/cbus/n810bm_main.c +MODULE_FIRMWARE(N810BM_PMM_BLOCK_FILENAME); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Michael Buesch"); -Index: linux-3.1-rc4/drivers/cbus/lipocharge.c +Index: linux-3.1/drivers/cbus/lipocharge.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/lipocharge.c 2011-10-29 20:46:00.683428775 +0200 ++++ linux-3.1/drivers/cbus/lipocharge.c 2011-10-30 00:48:58.765036552 +0200 @@ -0,0 +1,183 @@ +/* + * Generic LIPO battery charger @@ -1805,10 +1805,10 @@ Index: linux-3.1-rc4/drivers/cbus/lipocharge.c + + return 0; +} -Index: linux-3.1-rc4/drivers/cbus/lipocharge.h +Index: linux-3.1/drivers/cbus/lipocharge.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/drivers/cbus/lipocharge.h 2011-10-29 20:46:00.683428775 +0200 ++++ linux-3.1/drivers/cbus/lipocharge.h 2011-10-30 00:48:58.765036552 +0200 @@ -0,0 +1,60 @@ +#ifndef LIPOCHARGE_H_ +#define LIPOCHARGE_H_ @@ -1870,10 +1870,10 @@ Index: linux-3.1-rc4/drivers/cbus/lipocharge.h +} + +#endif /* LIPOCHARGE_H_ */ -Index: linux-3.1-rc4/drivers/cbus/cbus.c +Index: linux-3.1/drivers/cbus/cbus.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/cbus.c 2011-10-29 20:45:47.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/cbus.c 2011-10-29 20:46:23.875375085 +0200 +--- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 00:48:46.413045272 +0200 ++++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:58.765036552 +0200 @@ -34,6 +34,7 @@ #include <linux/gpio.h> #include <linux/platform_device.h> @@ -1896,10 +1896,10 @@ Index: linux-3.1-rc4/drivers/cbus/cbus.c MODULE_DESCRIPTION("CBUS serial protocol"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Juha Yrjölä"); -Index: linux-3.1-rc4/drivers/cbus/cbus.h +Index: linux-3.1/drivers/cbus/cbus.h =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/cbus.h 2011-10-29 20:45:09.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/cbus.h 2011-10-29 20:46:00.683428775 +0200 +--- linux-3.1.orig/drivers/cbus/cbus.h 2011-10-30 00:48:42.989047642 +0200 ++++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 00:48:58.765036552 +0200 @@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device * extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg, unsigned val); @@ -1907,10 +1907,10 @@ Index: linux-3.1-rc4/drivers/cbus/cbus.h +NORET_TYPE void cbus_emergency(void) ATTRIB_NORET; + #endif /* __DRIVERS_CBUS_CBUS_H */ -Index: linux-3.1-rc4/drivers/cbus/retu.c +Index: linux-3.1/drivers/cbus/retu.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/retu.c 2011-10-29 20:45:09.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/retu.c 2011-10-29 20:46:00.683428775 +0200 +--- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 00:48:46.413045272 +0200 ++++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:58.765036552 +0200 @@ -417,6 +417,11 @@ static int retu_allocate_children(struct if (!child) return -ENOMEM; @@ -1923,10 +1923,10 @@ Index: linux-3.1-rc4/drivers/cbus/retu.c return 0; } -Index: linux-3.1-rc4/drivers/cbus/tahvo.c +Index: linux-3.1/drivers/cbus/tahvo.c =================================================================== ---- linux-3.1-rc4.orig/drivers/cbus/tahvo.c 2011-10-29 20:45:09.000000000 +0200 -+++ linux-3.1-rc4/drivers/cbus/tahvo.c 2011-10-29 20:46:00.683428775 +0200 +--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 00:48:46.413045272 +0200 ++++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:58.765036552 +0200 @@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev __tahvo_write_reg(tahvo, reg, w); mutex_unlock(&tahvo->mutex); |