omap24xx: Refresh 2.6.37 patches

SVN-Revision: 25143
master
Michael Büsch 14 years ago
parent d8634c4521
commit 444541f6f8
  1. 48
      target/linux/omap24xx/patches-2.6.37/300-nokia-board.patch
  2. 10
      target/linux/omap24xx/patches-2.6.37/310-n8x0-gpioswitch-input.patch
  3. 78
      target/linux/omap24xx/patches-2.6.37/500-cbus.patch
  4. 8
      target/linux/omap24xx/patches-2.6.37/800-decompress-unlzo-fixes.patch
  5. 20
      target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch

@ -9,10 +9,10 @@
arch/arm/mach-omap2/serial.c | 8 arch/arm/mach-omap2/serial.c | 8
8 files changed, 608 insertions(+), 87 deletions(-) 8 files changed, 608 insertions(+), 87 deletions(-)
Index: linux-2.6.37-rc1/arch/arm/mach-omap1/board-nokia770.c Index: linux-2.6.37/arch/arm/mach-omap1/board-nokia770.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap1/board-nokia770.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap1/board-nokia770.c 2011-01-27 14:17:04.376000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap1/board-nokia770.c 2010-11-06 17:20:54.534000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap1/board-nokia770.c 2011-01-27 14:17:29.131000007 +0100
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include <plat/lcd_mipid.h> #include <plat/lcd_mipid.h>
#include <plat/mmc.h> #include <plat/mmc.h>
@ -45,10 +45,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap1/board-nokia770.c
}; };
static void mipid_shutdown(struct mipid_platform_data *pdata) static void mipid_shutdown(struct mipid_platform_data *pdata)
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/board-n8x0.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:04.381000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c 2010-11-06 17:26:56.824022830 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:29.132000007 +0100
@@ -18,9 +18,13 @@ @@ -18,9 +18,13 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/stddef.h> #include <linux/stddef.h>
@ -483,10 +483,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c
n8x0_onenand_init(); n8x0_onenand_init();
n8x0_mmc_init(); n8x0_mmc_init();
n8x0_usb_init(); n8x0_usb_init();
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-lcd.c Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0-lcd.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-lcd.c 2010-11-06 17:26:25.503999974 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-01-27 14:17:29.132000007 +0100
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* +/*
+ * linux/arch/arm/mach-omap2/board-n8x0.c + * linux/arch/arm/mach-omap2/board-n8x0.c
@ -615,10 +615,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-lcd.c
+ +
+ printk(KERN_INFO "N8x0 Blizzard initialized"); + printk(KERN_INFO "N8x0 Blizzard initialized");
+} +}
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-usb.c Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0-usb.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-usb.c 2010-11-06 17:20:54.534000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0-usb.c 2011-01-27 14:17:29.132000007 +0100
@@ -0,0 +1,175 @@ @@ -0,0 +1,175 @@
+/* +/*
+ * linux/arch/arm/mach-omap2/board-n8x0-usb.c + * linux/arch/arm/mach-omap2/board-n8x0-usb.c
@ -795,10 +795,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-usb.c
+err: +err:
+ gpio_free(GPIO_TUSB_ENABLE); + gpio_free(GPIO_TUSB_ENABLE);
+} +}
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/control.c Index: linux-2.6.37/arch/arm/mach-omap2/control.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/control.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/control.c 2011-01-27 14:17:04.403000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/control.c 2010-11-06 17:20:54.534000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/control.c 2011-01-27 14:17:29.132000007 +0100
@@ -172,6 +172,7 @@ @@ -172,6 +172,7 @@
return __raw_readw(OMAP_CTRL_REGADDR(offset)); return __raw_readw(OMAP_CTRL_REGADDR(offset));
} }
@ -815,10 +815,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/control.c
void omap_ctrl_writel(u32 val, u16 offset) void omap_ctrl_writel(u32 val, u16 offset)
{ {
__raw_writel(val, OMAP_CTRL_REGADDR(offset)); __raw_writel(val, OMAP_CTRL_REGADDR(offset));
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/Kconfig Index: linux-2.6.37/arch/arm/mach-omap2/Kconfig
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/Kconfig 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/Kconfig 2011-01-27 14:17:04.391000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/Kconfig 2010-11-06 17:20:54.534000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/Kconfig 2011-01-27 14:17:29.132000007 +0100
@@ -210,6 +210,16 @@ @@ -210,6 +210,16 @@
select MACH_NOKIA_N810 select MACH_NOKIA_N810
select MACH_NOKIA_N810_WIMAX select MACH_NOKIA_N810_WIMAX
@ -836,10 +836,10 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/Kconfig
config MACH_NOKIA_RX51 config MACH_NOKIA_RX51
bool "Nokia RX-51 board" bool "Nokia RX-51 board"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/Makefile Index: linux-2.6.37/arch/arm/mach-omap2/Makefile
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/Makefile 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/Makefile 2011-01-27 14:17:04.386000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/Makefile 2010-11-06 17:20:54.534000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/Makefile 2011-01-27 14:17:29.132000007 +0100
@@ -139,6 +139,8 @@ @@ -139,6 +139,8 @@
hsmmc.o \ hsmmc.o \
board-flash.o board-flash.o
@ -849,11 +849,11 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/Makefile
obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
board-rx51-sdram.o \ board-rx51-sdram.o \
board-rx51-peripherals.o \ board-rx51-peripherals.o \
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/serial.c Index: linux-2.6.37/arch/arm/mach-omap2/serial.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/serial.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/serial.c 2011-01-27 14:17:04.398000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/serial.c 2010-11-06 17:20:54.535000001 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/serial.c 2011-01-27 14:17:29.132000007 +0100
@@ -545,14 +545,17 @@ @@ -546,14 +546,17 @@
uart->padconf = 0; uart->padconf = 0;
} }
@ -871,7 +871,7 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/serial.c
int ret; int ret;
struct omap_uart_state *uart; struct omap_uart_state *uart;
@@ -569,6 +572,7 @@ @@ -570,6 +573,7 @@
free_irq(uart->irq, (void *)uart); free_irq(uart->irq, (void *)uart);
} }
} }

@ -2,11 +2,11 @@
arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+) 1 file changed, 73 insertions(+)
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/board-n8x0.c 2010-11-05 17:03:59.354999895 +0100 --- linux-2.6.37.orig/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:29.132000007 +0100
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c 2010-11-05 17:04:41.040001926 +0100 +++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:32.763000006 +0100
@@ -794,6 +794,77 @@ @@ -789,6 +789,77 @@
extern void n8x0_usb_init(void); extern void n8x0_usb_init(void);
@ -84,7 +84,7 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c
static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = { static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = {
{ {
.name = "headphone", .name = "headphone",
@@ -815,11 +886,13 @@ @@ -810,11 +881,13 @@
.gpio = -1, .gpio = -1,
.debounce_rising = 200, .debounce_rising = 200,
.debounce_falling = 200, .debounce_falling = 200,

@ -19,10 +19,10 @@
drivers/cbus/user_retu_tahvo.h | 75 +++ drivers/cbus/user_retu_tahvo.h | 75 +++
18 files changed, 4533 insertions(+), 1 deletion(-) 18 files changed, 4533 insertions(+), 1 deletion(-)
Index: linux-2.6.37-rc1/drivers/cbus/cbus.c Index: linux-2.6.37/drivers/cbus/cbus.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/cbus.c 2010-11-05 17:04:49.000997852 +0100 +++ linux-2.6.37/drivers/cbus/cbus.c 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,309 @@ @@ -0,0 +1,309 @@
+/* +/*
+ * drivers/cbus/cbus.c + * drivers/cbus/cbus.c
@ -333,10 +333,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/cbus.c
+MODULE_AUTHOR("David Weinehall"); +MODULE_AUTHOR("David Weinehall");
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
+ +
Index: linux-2.6.37-rc1/drivers/cbus/cbus.h Index: linux-2.6.37/drivers/cbus/cbus.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/cbus.h 2010-11-05 17:04:49.000997852 +0100 +++ linux-2.6.37/drivers/cbus/cbus.h 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+/* +/*
+ * drivers/cbus/cbus.h + * drivers/cbus/cbus.h
@ -374,10 +374,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/cbus.h
+extern int cbus_write_reg(struct cbus_host *host, int dev, int reg, u16 val); +extern int cbus_write_reg(struct cbus_host *host, int dev, int reg, u16 val);
+ +
+#endif /* __DRIVERS_CBUS_CBUS_H */ +#endif /* __DRIVERS_CBUS_CBUS_H */
Index: linux-2.6.37-rc1/drivers/cbus/Kconfig Index: linux-2.6.37/drivers/cbus/Kconfig
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/Kconfig 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/Kconfig 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+# +#
+# CBUS device configuration +# CBUS device configuration
@ -468,10 +468,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/Kconfig
+ sysfs. + sysfs.
+ +
+endmenu +endmenu
Index: linux-2.6.37-rc1/drivers/cbus/Makefile Index: linux-2.6.37/drivers/cbus/Makefile
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/Makefile 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/Makefile 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+# +#
+# Makefile for CBUS. +# Makefile for CBUS.
@ -487,10 +487,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/Makefile
+obj-$(CONFIG_CBUS_TAHVO_USER) += tahvo-user.o +obj-$(CONFIG_CBUS_TAHVO_USER) += tahvo-user.o
+obj-$(CONFIG_CBUS_RETU_USER) += retu-user.o +obj-$(CONFIG_CBUS_RETU_USER) += retu-user.o
+obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o +obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o
Index: linux-2.6.37-rc1/drivers/cbus/retu.c Index: linux-2.6.37/drivers/cbus/retu.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu.c 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/retu.c 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,468 @@ @@ -0,0 +1,468 @@
+/** +/**
+ * drivers/cbus/retu.c + * drivers/cbus/retu.c
@ -960,10 +960,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu.c
+MODULE_DESCRIPTION("Retu ASIC control"); +MODULE_DESCRIPTION("Retu ASIC control");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen"); +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
Index: linux-2.6.37-rc1/drivers/cbus/retu.h Index: linux-2.6.37/drivers/cbus/retu.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu.h 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/retu.h 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
+/** +/**
+ * drivers/cbus/retu.h + * drivers/cbus/retu.h
@ -1042,10 +1042,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu.h
+extern spinlock_t retu_lock; +extern spinlock_t retu_lock;
+ +
+#endif /* __DRIVERS_CBUS_RETU_H */ +#endif /* __DRIVERS_CBUS_RETU_H */
Index: linux-2.6.37-rc1/drivers/cbus/retu-headset.c Index: linux-2.6.37/drivers/cbus/retu-headset.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu-headset.c 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/retu-headset.c 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,356 @@ @@ -0,0 +1,356 @@
+/** +/**
+ * Retu/Vilma headset detection + * Retu/Vilma headset detection
@ -1403,10 +1403,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu-headset.c
+MODULE_DESCRIPTION("Retu/Vilma headset detection"); +MODULE_DESCRIPTION("Retu/Vilma headset detection");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä"); +MODULE_AUTHOR("Juha Yrjölä");
Index: linux-2.6.37-rc1/drivers/cbus/retu-pwrbutton.c Index: linux-2.6.37/drivers/cbus/retu-pwrbutton.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu-pwrbutton.c 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/retu-pwrbutton.c 2011-01-27 14:17:39.085000008 +0100
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
+/** +/**
+ * drivers/cbus/retu-pwrbutton.c + * drivers/cbus/retu-pwrbutton.c
@ -1526,10 +1526,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu-pwrbutton.c
+MODULE_DESCRIPTION("Retu Power Button"); +MODULE_DESCRIPTION("Retu Power Button");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ari Saastamoinen"); +MODULE_AUTHOR("Ari Saastamoinen");
Index: linux-2.6.37-rc1/drivers/cbus/retu-rtc.c Index: linux-2.6.37/drivers/cbus/retu-rtc.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu-rtc.c 2010-11-05 17:04:49.001997921 +0100 +++ linux-2.6.37/drivers/cbus/retu-rtc.c 2011-01-27 14:17:39.086000008 +0100
@@ -0,0 +1,477 @@ @@ -0,0 +1,477 @@
+/** +/**
+ * drivers/cbus/retu-rtc.c + * drivers/cbus/retu-rtc.c
@ -2008,10 +2008,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu-rtc.c
+MODULE_DESCRIPTION("Retu RTC"); +MODULE_DESCRIPTION("Retu RTC");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Paul Mundt and Igor Stoppa"); +MODULE_AUTHOR("Paul Mundt and Igor Stoppa");
Index: linux-2.6.37-rc1/drivers/cbus/retu-user.c Index: linux-2.6.37/drivers/cbus/retu-user.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu-user.c 2010-11-05 17:04:49.002997987 +0100 +++ linux-2.6.37/drivers/cbus/retu-user.c 2011-01-27 14:17:39.086000008 +0100
@@ -0,0 +1,424 @@ @@ -0,0 +1,424 @@
+/** +/**
+ * drivers/cbus/retu-user.c + * drivers/cbus/retu-user.c
@ -2437,10 +2437,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu-user.c
+MODULE_DESCRIPTION("Retu ASIC user space functions"); +MODULE_DESCRIPTION("Retu ASIC user space functions");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
Index: linux-2.6.37-rc1/drivers/cbus/retu-wdt.c Index: linux-2.6.37/drivers/cbus/retu-wdt.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/retu-wdt.c 2010-11-05 17:04:49.002997987 +0100 +++ linux-2.6.37/drivers/cbus/retu-wdt.c 2011-01-27 14:17:39.086000008 +0100
@@ -0,0 +1,387 @@ @@ -0,0 +1,387 @@
+/** +/**
+ * drivers/cbus/retu-wdt.c + * drivers/cbus/retu-wdt.c
@ -2829,10 +2829,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu-wdt.c
+MODULE_AUTHOR("Amit Kucheria"); +MODULE_AUTHOR("Amit Kucheria");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+ +
Index: linux-2.6.37-rc1/drivers/cbus/tahvo.c Index: linux-2.6.37/drivers/cbus/tahvo.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/tahvo.c 2010-11-05 17:04:49.002997987 +0100 +++ linux-2.6.37/drivers/cbus/tahvo.c 2011-01-27 14:17:39.086000008 +0100
@@ -0,0 +1,443 @@ @@ -0,0 +1,443 @@
+/** +/**
+ * drivers/cbus/tahvo.c + * drivers/cbus/tahvo.c
@ -3277,10 +3277,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/tahvo.c
+MODULE_DESCRIPTION("Tahvo ASIC control"); +MODULE_DESCRIPTION("Tahvo ASIC control");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen"); +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
Index: linux-2.6.37-rc1/drivers/cbus/tahvo.h Index: linux-2.6.37/drivers/cbus/tahvo.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/tahvo.h 2010-11-05 17:04:49.002997987 +0100 +++ linux-2.6.37/drivers/cbus/tahvo.h 2011-01-27 14:17:39.086000008 +0100
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* +/*
+ * drivers/cbus/tahvo.h + * drivers/cbus/tahvo.h
@ -3343,10 +3343,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/tahvo.h
+extern spinlock_t tahvo_lock; +extern spinlock_t tahvo_lock;
+ +
+#endif /* __DRIVERS_CBUS_TAHVO_H */ +#endif /* __DRIVERS_CBUS_TAHVO_H */
Index: linux-2.6.37-rc1/drivers/cbus/tahvo-usb.c Index: linux-2.6.37/drivers/cbus/tahvo-usb.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/tahvo-usb.c 2010-11-05 17:04:49.002997987 +0100 +++ linux-2.6.37/drivers/cbus/tahvo-usb.c 2011-01-27 14:17:39.087000008 +0100
@@ -0,0 +1,788 @@ @@ -0,0 +1,788 @@
+/** +/**
+ * drivers/cbus/tahvo-usb.c + * drivers/cbus/tahvo-usb.c
@ -4136,10 +4136,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/tahvo-usb.c
+MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver"); +MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs"); +MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs");
Index: linux-2.6.37-rc1/drivers/cbus/tahvo-user.c Index: linux-2.6.37/drivers/cbus/tahvo-user.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/tahvo-user.c 2010-11-05 17:04:49.003998052 +0100 +++ linux-2.6.37/drivers/cbus/tahvo-user.c 2011-01-27 14:17:39.087000008 +0100
@@ -0,0 +1,406 @@ @@ -0,0 +1,406 @@
+/** +/**
+ * drivers/cbus/tahvo-user.c + * drivers/cbus/tahvo-user.c
@ -4547,10 +4547,10 @@ Index: linux-2.6.37-rc1/drivers/cbus/tahvo-user.c
+MODULE_DESCRIPTION("Tahvo ASIC user space functions"); +MODULE_DESCRIPTION("Tahvo ASIC user space functions");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
Index: linux-2.6.37-rc1/drivers/cbus/user_retu_tahvo.h Index: linux-2.6.37/drivers/cbus/user_retu_tahvo.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-rc1/drivers/cbus/user_retu_tahvo.h 2010-11-05 17:04:49.003998052 +0100 +++ linux-2.6.37/drivers/cbus/user_retu_tahvo.h 2011-01-27 14:17:39.087000008 +0100
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
+/** +/**
+ * drivers/cbus/user_retu_tahvo.h + * drivers/cbus/user_retu_tahvo.h
@ -4627,11 +4627,11 @@ Index: linux-2.6.37-rc1/drivers/cbus/user_retu_tahvo.h
+}; +};
+ +
+#endif +#endif
Index: linux-2.6.37-rc1/drivers/Makefile Index: linux-2.6.37/drivers/Makefile
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/drivers/Makefile 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/drivers/Makefile 2011-01-27 14:17:04.232000007 +0100
+++ linux-2.6.37-rc1/drivers/Makefile 2010-11-05 17:04:49.003998052 +0100 +++ linux-2.6.37/drivers/Makefile 2011-01-27 14:17:39.087000008 +0100
@@ -73,7 +73,7 @@ @@ -74,7 +74,7 @@
obj-$(CONFIG_INPUT) += input/ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/ obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/ obj-$(CONFIG_RTC_LIB) += rtc/
@ -4640,10 +4640,10 @@ Index: linux-2.6.37-rc1/drivers/Makefile
obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PPS) += pps/
obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_POWER_SUPPLY) += power/
Index: linux-2.6.37-rc1/arch/arm/Kconfig Index: linux-2.6.37/arch/arm/Kconfig
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/arch/arm/Kconfig 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/arch/arm/Kconfig 2011-01-27 14:17:04.178000007 +0100
+++ linux-2.6.37-rc1/arch/arm/Kconfig 2010-11-05 17:04:49.003998052 +0100 +++ linux-2.6.37/arch/arm/Kconfig 2011-01-27 14:17:39.087000008 +0100
@@ -1850,6 +1850,10 @@ @@ -1850,6 +1850,10 @@
source "drivers/Kconfig" source "drivers/Kconfig"

@ -2,9 +2,11 @@
lib/decompress_unlzo.c | 4 ++++ lib/decompress_unlzo.c | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
--- linux-2.6.35.orig/lib/decompress_unlzo.c Index: linux-2.6.37/lib/decompress_unlzo.c
+++ linux-2.6.35/lib/decompress_unlzo.c ===================================================================
@@ -50,6 +50,10 @@ static const unsigned char lzop_magic[] --- linux-2.6.37.orig/lib/decompress_unlzo.c 2011-01-27 14:17:20.745000007 +0100
+++ linux-2.6.37/lib/decompress_unlzo.c 2011-01-27 14:17:56.557000007 +0100
@@ -51,6 +51,10 @@
#define LZO_BLOCK_SIZE (256*1024l) #define LZO_BLOCK_SIZE (256*1024l)
#define HEADER_HAS_FILTER 0x00000800L #define HEADER_HAS_FILTER 0x00000800L

@ -4,10 +4,10 @@
include/linux/mmc/host.h | 2 ++ include/linux/mmc/host.h | 2 ++
3 files changed, 10 insertions(+), 4 deletions(-) 3 files changed, 10 insertions(+), 4 deletions(-)
Index: linux-2.6.37-rc1/drivers/mmc/host/omap.c Index: linux-2.6.37/drivers/mmc/host/omap.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/drivers/mmc/host/omap.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/drivers/mmc/host/omap.c 2011-01-27 14:16:57.305000007 +0100
+++ linux-2.6.37-rc1/drivers/mmc/host/omap.c 2010-11-05 17:07:25.130000416 +0100 +++ linux-2.6.37/drivers/mmc/host/omap.c 2011-01-27 14:17:59.807000006 +0100
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
mod_timer(&host->cmd_abort_timer, jiffies + HZ/2); mod_timer(&host->cmd_abort_timer, jiffies + HZ/2);
@ -36,10 +36,10 @@ Index: linux-2.6.37-rc1/drivers/mmc/host/omap.c
return 0; return 0;
Index: linux-2.6.37-rc1/drivers/mmc/core/core.c Index: linux-2.6.37/drivers/mmc/core/core.c
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/drivers/mmc/core/core.c 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/drivers/mmc/core/core.c 2011-01-27 14:16:57.297000007 +0100
+++ linux-2.6.37-rc1/drivers/mmc/core/core.c 2010-11-05 17:07:25.131000390 +0100 +++ linux-2.6.37/drivers/mmc/core/core.c 2011-01-27 14:17:59.807000006 +0100
@@ -74,12 +74,13 @@ @@ -74,12 +74,13 @@
} }
@ -56,11 +56,11 @@ Index: linux-2.6.37-rc1/drivers/mmc/core/core.c
/** /**
* mmc_request_done - finish processing an MMC request * mmc_request_done - finish processing an MMC request
Index: linux-2.6.37-rc1/include/linux/mmc/host.h Index: linux-2.6.37/include/linux/mmc/host.h
=================================================================== ===================================================================
--- linux-2.6.37-rc1.orig/include/linux/mmc/host.h 2010-11-01 12:54:12.000000000 +0100 --- linux-2.6.37.orig/include/linux/mmc/host.h 2011-01-27 14:16:57.292000007 +0100
+++ linux-2.6.37-rc1/include/linux/mmc/host.h 2010-11-05 17:07:25.131000390 +0100 +++ linux-2.6.37/include/linux/mmc/host.h 2011-01-27 14:17:59.807000006 +0100
@@ -306,5 +306,7 @@ @@ -307,5 +307,7 @@
return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable; return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable;
} }

Loading…
Cancel
Save