mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update kernel from 2.6.38.2 to 2.6.38.6 and refresh patches
Thank you Peter Wagner for the patch. I refreshed the kernel patches and added the md5sum of the kernel. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26905 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
|
||||
MAINTAINER:=Michael Buesch <mb@bu3sch.de>
|
||||
FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
|
||||
|
||||
LINUX_VERSION:=2.6.38.2
|
||||
LINUX_VERSION:=2.6.38.6
|
||||
|
||||
define Target/Description
|
||||
TI OMAP-24xx
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/bootreason.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/bootreason.c 2011-02-25 01:11:27.298563256 +0100
|
||||
--- /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-2.6.38-rc6/arch/arm/plat-omap/bootreason.c
|
||||
+}
|
||||
+
|
||||
+late_initcall(bootreason_init);
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/common.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/common.c 2011-02-25 01:10:25.645115298 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/common.c 2011-02-25 01:11:27.298563256 +0100
|
||||
--- a/arch/arm/plat-omap/common.c
|
||||
+++ b/arch/arm/plat-omap/common.c
|
||||
@@ -21,17 +21,89 @@
|
||||
#include <plat/vram.h>
|
||||
#include <plat/dsp.h>
|
||||
@@ -176,10 +172,8 @@ Index: linux-2.6.38-rc6/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-2.6.38-rc6/arch/arm/plat-omap/component-version.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/component-version.c 2011-02-25 01:11:27.299563117 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/plat-omap/component-version.c
|
||||
@@ -0,0 +1,64 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/plat-omap/component-version.c
|
||||
@@ -245,11 +239,9 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/component-version.c
|
||||
+MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD> <juha.yrjola@nokia.com>");
|
||||
+MODULE_DESCRIPTION("Component version driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Kconfig 2011-02-25 01:10:25.621118611 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig 2011-02-25 01:11:27.299563117 +0100
|
||||
@@ -79,6 +79,38 @@
|
||||
--- a/arch/arm/plat-omap/Kconfig
|
||||
+++ b/arch/arm/plat-omap/Kconfig
|
||||
@@ -79,6 +79,38 @@ config OMAP_RESET_CLOCKS
|
||||
probably do not want this option enabled until your
|
||||
device drivers work properly.
|
||||
|
||||
@@ -288,11 +280,9 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig
|
||||
config OMAP_MUX
|
||||
bool "OMAP multiplexing support"
|
||||
depends on ARCH_OMAP
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Makefile 2011-02-25 01:10:25.604120958 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/Makefile 2011-02-25 01:11:27.299563117 +0100
|
||||
@@ -23,6 +23,9 @@
|
||||
--- 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
|
||||
obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
|
||||
@@ -302,11 +292,9 @@ Index: linux-2.6.38-rc6/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-2.6.38-rc6/arch/arm/include/asm/setup.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/include/asm/setup.h 2011-02-25 01:10:25.523132140 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/include/asm/setup.h 2011-02-25 01:11:27.300562978 +0100
|
||||
@@ -136,6 +136,13 @@
|
||||
--- a/arch/arm/include/asm/setup.h
|
||||
+++ b/arch/arm/include/asm/setup.h
|
||||
@@ -136,6 +136,13 @@ struct tag_acorn {
|
||||
__u8 adfsdrives;
|
||||
};
|
||||
|
||||
@@ -320,7 +308,7 @@ Index: linux-2.6.38-rc6/arch/arm/include/asm/setup.h
|
||||
/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
|
||||
#define ATAG_MEMCLK 0x41000402
|
||||
|
||||
@@ -162,6 +169,11 @@
|
||||
@@ -162,6 +169,11 @@ struct tag {
|
||||
struct tag_acorn acorn;
|
||||
|
||||
/*
|
||||
@@ -332,10 +320,8 @@ Index: linux-2.6.38-rc6/arch/arm/include/asm/setup.h
|
||||
* DC21285 specific
|
||||
*/
|
||||
struct tag_memclk memclk;
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c 2011-02-25 01:11:27.301562839 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/plat-omap/gpio-switch.c
|
||||
@@ -0,0 +1,554 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/plat-omap/gpio-switch.c
|
||||
@@ -891,11 +877,9 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c
|
||||
+MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD> <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com");
|
||||
+MODULE_DESCRIPTION("GPIO switch driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/board.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/include/plat/board.h 2011-02-25 01:10:25.553127998 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/board.h 2011-02-25 01:11:27.301562839 +0100
|
||||
@@ -151,6 +151,14 @@
|
||||
--- 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;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:09:31.427080051 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:09:59.754956253 +0100
|
||||
--- a/arch/arm/mach-omap2/board-n8x0.c
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0.c
|
||||
@@ -15,8 +15,10 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/gpio.h>
|
||||
@@ -21,7 +19,7 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
|
||||
#include "mux.h"
|
||||
|
||||
@@ -194,6 +197,114 @@
|
||||
@@ -194,6 +197,114 @@ static struct omap_onenand_platform_data
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -136,7 +134,7 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
#if defined(CONFIG_MENELAUS) && \
|
||||
(defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))
|
||||
|
||||
@@ -628,11 +739,10 @@
|
||||
@@ -628,11 +739,10 @@ static void __init n8x0_map_io(void)
|
||||
omap242x_map_common_io();
|
||||
}
|
||||
|
||||
@@ -149,7 +147,7 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OMAP_MUX
|
||||
@@ -686,6 +796,8 @@
|
||||
@@ -686,6 +796,8 @@ static inline void board_serial_init(voi
|
||||
static void __init n8x0_init_machine(void)
|
||||
{
|
||||
omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
|
||||
@@ -158,7 +156,7 @@ Index: linux-2.6.38-rc6/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));
|
||||
@@ -703,27 +815,30 @@
|
||||
@@ -703,27 +815,30 @@ static void __init n8x0_init_machine(voi
|
||||
|
||||
MACHINE_START(NOKIA_N800, "Nokia N800")
|
||||
.boot_params = 0x80000100,
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-28 16:48:12.972504055 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-28 21:03:41.761254167 +0100
|
||||
--- a/arch/arm/mach-omap2/board-n8x0.c
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0.c
|
||||
@@ -23,6 +23,9 @@
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/usb/musb.h>
|
||||
@@ -306,10 +304,8 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
gpmc_onenand_init(board_onenand_data);
|
||||
n8x0_mmc_init();
|
||||
n8x0_usb_init();
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-28 21:08:50.105894872 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
@@ -0,0 +1,141 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-omap2/board-n8x0.c
|
||||
@@ -452,10 +448,8 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
+
|
||||
+ printk(KERN_INFO "N8x0 Blizzard initialized");
|
||||
+}
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/Makefile 2011-02-28 16:45:53.321456871 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile 2011-02-28 16:48:12.997503690 +0100
|
||||
--- a/arch/arm/mach-omap2/Makefile
|
||||
+++ b/arch/arm/mach-omap2/Makefile
|
||||
@@ -177,6 +177,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar
|
||||
hsmmc.o \
|
||||
board-flash.o
|
||||
@@ -464,10 +458,8 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile
|
||||
obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o \
|
||||
sdram-nokia.o \
|
||||
hsmmc.o
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h 2011-02-28 16:48:12.997503690 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/plat-omap/include/plat/cbus.h
|
||||
@@ -0,0 +1,40 @@
|
||||
+/*
|
||||
+ * cbus.h - CBUS platform_data definition
|
||||
@@ -509,10 +501,8 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h
|
||||
+};
|
||||
+
|
||||
+#endif /* __PLAT_CBUS_H */
|
||||
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-02-28 16:45:53.350456485 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h 2011-02-28 16:48:12.998503676 +0100
|
||||
--- a/arch/arm/plat-omap/include/plat/irqs.h
|
||||
+++ b/arch/arm/plat-omap/include/plat/irqs.h
|
||||
@@ -411,7 +411,20 @@
|
||||
#define TWL_IRQ_END TWL6030_IRQ_END
|
||||
#endif
|
||||
@@ -535,10 +525,8 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h
|
||||
|
||||
#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
|
||||
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-02-28 21:09:41.170169165 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-02-28 21:10:33.434425329 +0100
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
@@ -673,6 +673,7 @@ static struct omap_hwmod_ocp_if *omap242
|
||||
|
||||
static struct omap_hwmod omap2420_gpio1_hwmod = {
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 73 insertions(+)
|
||||
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:53:05.134457636 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:55:54.570320630 +0100
|
||||
@@ -225,6 +225,77 @@
|
||||
--- a/arch/arm/mach-omap2/board-n8x0.c
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0.c
|
||||
@@ -225,6 +225,77 @@ extern struct mipid_platform_data n8x0_m
|
||||
extern void n8x0_mipid_init(void);
|
||||
extern void n8x0_blizzard_init(void);
|
||||
|
||||
@@ -84,7 +82,7 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
|
||||
static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = {
|
||||
{
|
||||
.name = "headphone",
|
||||
@@ -246,11 +317,13 @@
|
||||
@@ -246,11 +317,13 @@ static struct omap_gpio_switch n8x0_gpio
|
||||
.gpio = -1,
|
||||
.debounce_rising = 200,
|
||||
.debounce_falling = 200,
|
||||
|
||||
@@ -11,10 +11,8 @@
|
||||
drivers/bluetooth/hci_h4p/uart.c | 169 +++++
|
||||
10 files changed, 1891 insertions(+)
|
||||
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c
|
||||
+MODULE_DESCRIPTION("h4 driver with nokia extensions");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Ville Tervo");
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c
|
||||
+
|
||||
+ return;
|
||||
+}
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/hci_h4p.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/hci_h4p.h 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/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-2.6.37-rc1/drivers/bluetooth/hci_h4p/Makefile
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/Makefile 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/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-2.6.37-rc1/drivers/bluetooth/hci_h4p/sysfs.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/sysfs.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /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-2.6.37-rc1/drivers/bluetooth/hci_h4p/sysfs.c
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c 2010-11-05 17:04:44.762000001 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/bluetooth/hci_h4p/uart.c
|
||||
@@ -0,0 +1,169 @@
|
||||
+/*
|
||||
+ * This file is part of hci_h4p bluetooth driver
|
||||
@@ -1931,11 +1915,9 @@ Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/bluetooth/Kconfig 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/Kconfig 2010-11-05 17:04:44.762000001 +0100
|
||||
@@ -173,6 +173,16 @@
|
||||
--- 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,11 +1934,9 @@ Index: linux-2.6.37-rc1/drivers/bluetooth/Kconfig
|
||||
config BT_HCIVHCI
|
||||
tristate "HCI VHCI (Virtual HCI device) driver"
|
||||
help
|
||||
Index: linux-2.6.37-rc1/drivers/bluetooth/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/bluetooth/Makefile 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/bluetooth/Makefile 2010-11-05 17:04:44.763000001 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
--- 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
|
||||
obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:32:55.783737501 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:33:09.851047680 +0100
|
||||
--- 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-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c
|
||||
#include <plat/serial.h>
|
||||
|
||||
#include <net/bluetooth/bluetooth.h>
|
||||
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:32:55.766739543 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:33:09.852047560 +0100
|
||||
--- 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-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h
|
||||
|
||||
#include <net/bluetooth/bluetooth.h>
|
||||
#include <net/bluetooth/hci_core.h>
|
||||
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:32:55.807734619 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:33:09.852047560 +0100
|
||||
--- 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;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-03-07 16:07:00.174343135 +0100
|
||||
+++ linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-03-07 16:09:15.601997493 +0100
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
@@ -362,7 +362,7 @@ static struct omap_hwmod_class uart_clas
|
||||
/* UART1 */
|
||||
|
||||
@@ -11,10 +9,8 @@ Index: linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c
|
||||
};
|
||||
|
||||
static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
|
||||
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/serial.c 2011-03-07 16:06:21.934958270 +0100
|
||||
+++ linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 2011-03-07 16:08:59.649922915 +0100
|
||||
--- 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;
|
||||
}
|
||||
|
||||
@@ -19,10 +19,8 @@
|
||||
drivers/cbus/user_retu_tahvo.h | 75 +++
|
||||
18 files changed, 4533 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/cbus.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/cbus.c 2011-02-24 12:04:51.456189134 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/cbus.c
|
||||
@@ -0,0 +1,332 @@
|
||||
+/*
|
||||
+ * drivers/cbus/cbus.c
|
||||
@@ -356,10 +354,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/cbus.c
|
||||
+MODULE_AUTHOR("Mikko Ylinen");
|
||||
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
|
||||
+
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/cbus.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/cbus.h 2011-02-24 12:04:51.456189134 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/cbus.h
|
||||
@@ -0,0 +1,29 @@
|
||||
+/*
|
||||
+ * drivers/cbus/cbus.h
|
||||
@@ -390,10 +386,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/cbus.h
|
||||
+extern int cbus_write_reg(unsigned dev, unsigned reg, unsigned val);
|
||||
+
|
||||
+#endif /* __DRIVERS_CBUS_CBUS_H */
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/Kconfig 2011-02-24 12:04:51.457189107 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/Kconfig
|
||||
@@ -0,0 +1,75 @@
|
||||
+#
|
||||
+# CBUS device configuration
|
||||
@@ -470,10 +464,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
|
||||
+ sysfs.
|
||||
+
|
||||
+endmenu
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/Makefile
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/Makefile 2011-02-24 12:04:51.458189081 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/Makefile
|
||||
@@ -0,0 +1,13 @@
|
||||
+#
|
||||
+# Makefile for CBUS.
|
||||
@@ -488,10 +480,8 @@ Index: linux-2.6.38-rc6/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-2.6.38-rc6/drivers/cbus/retu.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-24 12:04:51.458189081 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu.c
|
||||
@@ -0,0 +1,544 @@
|
||||
+/**
|
||||
+ * drivers/cbus/retu.c
|
||||
@@ -1037,10 +1027,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
+MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD>");
|
||||
+MODULE_AUTHOR("David Weinehall");
|
||||
+MODULE_AUTHOR("Mikko Ylinen");
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.h 2011-02-24 12:04:51.459189067 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu.h
|
||||
@@ -0,0 +1,66 @@
|
||||
+/**
|
||||
+ * drivers/cbus/retu.h
|
||||
@@ -1108,10 +1096,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu.h
|
||||
+int retu_read_adc(struct device *child, int channel);
|
||||
+
|
||||
+#endif /* __DRIVERS_CBUS_RETU_H */
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-headset.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-headset.c 2011-02-24 12:04:51.460189032 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu-headset.c
|
||||
@@ -0,0 +1,359 @@
|
||||
+/**
|
||||
+ * Retu/Vilma headset detection
|
||||
@@ -1472,10 +1458,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu-headset.c
|
||||
+MODULE_DESCRIPTION("Retu/Vilma headset detection");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD>");
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-pwrbutton.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-pwrbutton.c 2011-02-24 12:04:51.460189032 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu-pwrbutton.c
|
||||
@@ -0,0 +1,165 @@
|
||||
+/**
|
||||
+ * drivers/cbus/retu-pwrbutton.c
|
||||
@@ -1642,10 +1626,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu-pwrbutton.c
|
||||
+MODULE_AUTHOR("Ari Saastamoinen");
|
||||
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
|
||||
+
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-rtc.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-rtc.c 2011-02-24 12:04:51.461188993 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu-rtc.c
|
||||
@@ -0,0 +1,287 @@
|
||||
+/**
|
||||
+ * drivers/cbus/retu-rtc.c
|
||||
@@ -1934,10 +1916,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu-rtc.c
|
||||
+MODULE_AUTHOR("Igor Stoppa");
|
||||
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
|
||||
+
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-02-24 12:04:51.461188993 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -0,0 +1,358 @@
|
||||
+/**
|
||||
+ * drivers/cbus/retu-wdt.c
|
||||
@@ -2297,10 +2277,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
+MODULE_AUTHOR("Amit Kucheria");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/tahvo.c 2011-02-24 12:04:51.463188907 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/tahvo.c
|
||||
@@ -0,0 +1,391 @@
|
||||
+/**
|
||||
+ * drivers/cbus/tahvo.c
|
||||
@@ -2693,10 +2671,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c
|
||||
+MODULE_AUTHOR("David Weinehall");
|
||||
+MODULE_AUTHOR("Mikko Ylinen");
|
||||
+
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/tahvo.h 2011-02-24 12:04:51.463188907 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/tahvo.h
|
||||
@@ -0,0 +1,57 @@
|
||||
+/*
|
||||
+ * drivers/cbus/tahvo.h
|
||||
@@ -2755,10 +2731,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h
|
||||
+extern spinlock_t tahvo_lock;
|
||||
+
|
||||
+#endif /* __DRIVERS_CBUS_TAHVO_H */
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/tahvo-usb.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/tahvo-usb.c 2011-02-24 12:04:51.464188862 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/tahvo-usb.c
|
||||
@@ -0,0 +1,773 @@
|
||||
+/**
|
||||
+ * drivers/cbus/tahvo-usb.c
|
||||
@@ -3533,11 +3507,9 @@ Index: linux-2.6.38-rc6/drivers/cbus/tahvo-usb.c
|
||||
+MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD>, Tony Lindgren, and Timo Ter<65>s");
|
||||
Index: linux-2.6.38-rc6/drivers/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/Makefile 2011-02-24 12:03:07.439316519 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/Makefile 2011-02-24 12:03:27.457522207 +0100
|
||||
@@ -74,7 +74,7 @@
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -74,7 +74,7 @@ obj-$(CONFIG_GAMEPORT) += input/gamepor
|
||||
obj-$(CONFIG_INPUT) += input/
|
||||
obj-$(CONFIG_I2O) += message/
|
||||
obj-$(CONFIG_RTC_LIB) += rtc/
|
||||
@@ -3546,11 +3518,9 @@ Index: linux-2.6.38-rc6/drivers/Makefile
|
||||
obj-$(CONFIG_PPS) += pps/
|
||||
obj-$(CONFIG_W1) += w1/
|
||||
obj-$(CONFIG_POWER_SUPPLY) += power/
|
||||
Index: linux-2.6.38-rc6/arch/arm/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/Kconfig 2011-02-24 12:03:07.286322589 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/Kconfig 2011-02-24 12:03:27.458522167 +0100
|
||||
@@ -1930,6 +1930,10 @@
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1930,6 +1930,10 @@ source "net/Kconfig"
|
||||
|
||||
source "drivers/Kconfig"
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-27 18:01:26.306458689 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-27 18:05:56.472263901 +0100
|
||||
@@ -205,7 +205,7 @@
|
||||
--- a/drivers/cbus/retu.c
|
||||
+++ b/drivers/cbus/retu.c
|
||||
@@ -205,7 +205,7 @@ static irqreturn_t retu_irq_handler(int
|
||||
return IRQ_NONE;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-26 23:23:34.014429906 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-26 23:25:18.905358127 +0100
|
||||
@@ -120,7 +120,9 @@
|
||||
--- a/drivers/cbus/retu.c
|
||||
+++ b/drivers/cbus/retu.c
|
||||
@@ -120,7 +120,9 @@ void retu_write_reg(struct device *child
|
||||
{
|
||||
struct retu *retu = dev_get_drvdata(child->parent);
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-28 15:21:10.645505891 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-28 15:22:24.030477769 +0100
|
||||
--- a/drivers/cbus/retu.c
|
||||
+++ b/drivers/cbus/retu.c
|
||||
@@ -198,10 +198,12 @@ static irqreturn_t retu_irq_handler(int
|
||||
u16 idr;
|
||||
u16 imr;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.h 2011-02-25 02:16:28.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.h 2011-02-25 23:36:10.363457910 +0100
|
||||
--- a/drivers/cbus/retu.h
|
||||
+++ b/drivers/cbus/retu.h
|
||||
@@ -40,6 +40,8 @@
|
||||
#define RETU_REG_CTRL_CLR 0x0f /* Regulator clear register */
|
||||
#define RETU_REG_CTRL_SET 0x10 /* Regulator set register */
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.h 2011-02-25 02:16:28.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/tahvo.h 2011-02-25 23:41:00.321263098 +0100
|
||||
--- a/drivers/cbus/tahvo.h
|
||||
+++ b/drivers/cbus/tahvo.h
|
||||
@@ -30,12 +30,23 @@
|
||||
#define TAHVO_REG_IDR 0x01 /* Interrupt ID */
|
||||
#define TAHVO_REG_IDSR 0x02 /* Interrupt status */
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-02 16:08:59.022211654 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-02 16:29:43.215284501 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -58,13 +58,11 @@ struct retu_wdt_dev {
|
||||
struct device *dev;
|
||||
int users;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-02 16:46:24.574676092 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-02 16:48:17.469807413 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -56,7 +56,7 @@ static int counter_param = RETU_WDT_MAX_
|
||||
|
||||
struct retu_wdt_dev {
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 15:45:37.533948567 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 15:46:21.312816961 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -52,7 +52,6 @@ static DEFINE_MUTEX(retu_wdt_mutex);
|
||||
|
||||
/* Current period of watchdog */
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 15:46:21.312816961 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 15:46:54.658384947 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -124,9 +124,9 @@ static int retu_wdt_release(struct inode
|
||||
struct retu_wdt_dev *wdev = file->private_data;
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 16:22:03.524019824 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 16:22:31.186357952 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -7,6 +7,8 @@
|
||||
*
|
||||
* Written by Amit Kucheria <amit.kucheria@nokia.com>
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 16:21:39.106113985 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 16:21:48.503540758 +0100
|
||||
--- a/drivers/cbus/retu-wdt.c
|
||||
+++ b/drivers/cbus/retu-wdt.c
|
||||
@@ -149,7 +149,7 @@ static long retu_wdt_ioctl(struct file *
|
||||
struct retu_wdt_dev *wdev = container_of(mdev, struct retu_wdt_dev, miscdev);
|
||||
int new_margin;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:47:41.147540155 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:50:59.658485748 +0100
|
||||
--- a/drivers/cbus/tahvo-usb.c
|
||||
+++ b/drivers/cbus/tahvo-usb.c
|
||||
@@ -99,7 +99,7 @@ struct tahvo_usb {
|
||||
int tahvo_mode;
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:51:46.240795227 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:52:34.430126706 +0100
|
||||
--- a/drivers/cbus/tahvo-usb.c
|
||||
+++ b/drivers/cbus/tahvo-usb.c
|
||||
@@ -725,6 +725,8 @@ static int __init tahvo_usb_probe(struct
|
||||
|
||||
static int __exit tahvo_usb_remove(struct platform_device *pdev)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:55:47.177917578 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:58:35.869996276 +0100
|
||||
--- a/drivers/cbus/tahvo-usb.c
|
||||
+++ b/drivers/cbus/tahvo-usb.c
|
||||
@@ -98,6 +98,7 @@ struct tahvo_usb {
|
||||
#ifdef CONFIG_USB_OTG
|
||||
int tahvo_mode;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/board-n8x0.c 2011-03-09 18:47:07.749508720 +0100
|
||||
+++ linux-2.6.38-rc7/arch/arm/mach-omap2/board-n8x0.c 2011-03-09 18:59:14.355835051 +0100
|
||||
--- a/arch/arm/mach-omap2/board-n8x0.c
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <plat/serial.h>
|
||||
#include <plat/cbus.h>
|
||||
|
||||
@@ -5,11 +5,9 @@
|
||||
include/linux/spi/tsc2005.h | 30 +
|
||||
4 files changed, 1000 insertions(+)
|
||||
|
||||
Index: linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Kconfig 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig 2011-02-24 00:23:46.456893349 +0100
|
||||
@@ -629,6 +629,17 @@
|
||||
--- a/drivers/input/touchscreen/Kconfig
|
||||
+++ b/drivers/input/touchscreen/Kconfig
|
||||
@@ -629,6 +629,17 @@ config TOUCHSCREEN_TOUCHIT213
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called touchit213.
|
||||
|
||||
@@ -27,11 +25,9 @@ Index: linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig
|
||||
config TOUCHSCREEN_TSC2007
|
||||
tristate "TSC2007 based touchscreens"
|
||||
depends on I2C
|
||||
Index: linux-2.6.38-rc6/drivers/input/touchscreen/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Makefile 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/input/touchscreen/Makefile 2011-02-24 00:23:46.457893305 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
--- a/drivers/input/touchscreen/Makefile
|
||||
+++ b/drivers/input/touchscreen/Makefile
|
||||
@@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += t
|
||||
obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
|
||||
@@ -39,10 +35,8 @@ Index: linux-2.6.38-rc6/drivers/input/touchscreen/Makefile
|
||||
obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
|
||||
Index: linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c 2011-02-24 00:23:46.459893217 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/input/touchscreen/tsc2005.c
|
||||
@@ -0,0 +1,958 @@
|
||||
+/*
|
||||
+ * TSC2005 touchscreen driver
|
||||
@@ -1002,10 +996,8 @@ Index: linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c
|
||||
+MODULE_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:tsc2005");
|
||||
Index: linux-2.6.38-rc6/include/linux/spi/tsc2005.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/include/linux/spi/tsc2005.h 2011-02-24 00:23:46.459893217 +0100
|
||||
--- /dev/null
|
||||
+++ b/include/linux/spi/tsc2005.h
|
||||
@@ -0,0 +1,30 @@
|
||||
+#ifndef _LINUX_SPI_TSC2005_H
|
||||
+#define _LINUX_SPI_TSC2005_H
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
drivers/input/evdev.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: linux-2.6.38-rc6/drivers/input/evdev.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/input/evdev.c 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/input/evdev.c 2011-02-24 00:23:52.155643164 +0100
|
||||
@@ -78,7 +78,7 @@
|
||||
--- a/drivers/input/evdev.c
|
||||
+++ b/drivers/input/evdev.c
|
||||
@@ -78,7 +78,7 @@ static void evdev_event(struct input_han
|
||||
unsigned int type, unsigned int code, int value)
|
||||
{
|
||||
struct evdev *evdev = handle->private;
|
||||
@@ -15,7 +13,7 @@ Index: linux-2.6.38-rc6/drivers/input/evdev.c
|
||||
struct input_event event;
|
||||
|
||||
do_gettimeofday(&event.time);
|
||||
@@ -89,9 +89,13 @@
|
||||
@@ -89,9 +89,13 @@ static void evdev_event(struct input_han
|
||||
rcu_read_lock();
|
||||
|
||||
client = rcu_dereference(evdev->grab);
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 00:58:54.735744872 +0100
|
||||
@@ -1456,6 +1456,7 @@
|
||||
--- 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;
|
||||
|
||||
host->irq = irq;
|
||||
@@ -10,7 +8,7 @@ Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
|
||||
host->phys_base = host->mem_res->start;
|
||||
host->virt_base = ioremap(res->start, res->end - res->start + 1);
|
||||
if (!host->virt_base)
|
||||
@@ -1495,7 +1496,9 @@
|
||||
@@ -1495,7 +1496,9 @@ static int __init mmc_omap_probe(struct
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,11 +19,9 @@ Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
|
||||
|
||||
return 0;
|
||||
|
||||
Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-27 00:57:32.633556994 +0100
|
||||
@@ -75,12 +75,13 @@
|
||||
--- a/drivers/mmc/core/core.c
|
||||
+++ b/drivers/mmc/core/core.c
|
||||
@@ -75,12 +75,13 @@ static int mmc_schedule_delayed_work(str
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -41,11 +37,9 @@ Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
|
||||
|
||||
/**
|
||||
* mmc_request_done - finish processing an MMC request
|
||||
Index: linux-2.6.38-rc6/include/linux/mmc/host.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100
|
||||
+++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-27 00:57:32.633556994 +0100
|
||||
@@ -326,5 +326,7 @@
|
||||
--- a/include/linux/mmc/host.h
|
||||
+++ b/include/linux/mmc/host.h
|
||||
@@ -325,5 +325,7 @@ static inline int mmc_card_is_powered_re
|
||||
return host->pm_flags & MMC_PM_KEEP_POWER;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-27 16:56:51.714348509 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 16:57:30.796529124 +0100
|
||||
@@ -832,7 +832,7 @@
|
||||
--- a/drivers/mmc/host/omap.c
|
||||
+++ b/drivers/mmc/host/omap.c
|
||||
@@ -832,7 +832,7 @@ static irqreturn_t mmc_omap_irq(int irq,
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
arch/arm/mach-omap2/board-n8x0-lcd.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-24 12:37:51.702386250 +0100
|
||||
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-24 12:39:35.223028410 +0100
|
||||
@@ -34,8 +34,26 @@
|
||||
--- a/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
+++ b/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
@@ -34,8 +34,26 @@ static void mipid_shutdown(struct mipid_
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/serial.c 2011-03-07 17:24:16.786259530 +0100
|
||||
+++ linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 2011-03-07 17:24:18.951998600 +0100
|
||||
--- 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
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc7/drivers/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/Makefile 2011-03-06 18:50:23.464476877 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/Makefile 2011-03-06 18:51:09.485478381 +0100
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -66,7 +66,7 @@ obj-$(CONFIG_TC) += tc/
|
||||
obj-$(CONFIG_UWB) += uwb/
|
||||
obj-$(CONFIG_USB_OTG_UTILS) += usb/otg/
|
||||
@@ -11,10 +9,8 @@ Index: linux-2.6.38-rc7/drivers/Makefile
|
||||
obj-$(CONFIG_PCI) += usb/
|
||||
obj-$(CONFIG_USB_GADGET) += usb/gadget/
|
||||
obj-$(CONFIG_SERIO) += input/serio/
|
||||
Index: linux-2.6.38-rc7/drivers/usb/musb/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/usb/musb/Kconfig 2011-03-06 18:50:23.514483397 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/usb/musb/Kconfig 2011-03-06 18:51:09.486478512 +0100
|
||||
--- a/drivers/usb/musb/Kconfig
|
||||
+++ b/drivers/usb/musb/Kconfig
|
||||
@@ -46,7 +46,7 @@ config USB_MUSB_DA8XX
|
||||
depends on ARCH_DAVINCI_DA8XX
|
||||
|
||||
@@ -24,10 +20,8 @@ Index: linux-2.6.38-rc7/drivers/usb/musb/Kconfig
|
||||
depends on ARCH_OMAP
|
||||
|
||||
config USB_MUSB_OMAP2PLUS
|
||||
Index: linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/usb/musb/tusb6010.c 2011-03-06 18:50:23.497481181 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c 2011-03-06 18:51:09.487478643 +0100
|
||||
--- a/drivers/usb/musb/tusb6010.c
|
||||
+++ b/drivers/usb/musb/tusb6010.c
|
||||
@@ -55,6 +55,7 @@ u8 tusb_get_revision(struct musb *musb)
|
||||
|
||||
return rev;
|
||||
@@ -76,10 +70,8 @@ Index: linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c
|
||||
platform_driver_unregister(&tusb_driver);
|
||||
}
|
||||
-module_exit(tusb_exit);
|
||||
Index: linux-2.6.38-rc7/drivers/usb/musb/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/usb/musb/Makefile 2011-03-06 18:50:23.481479093 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/usb/musb/Makefile 2011-03-06 18:51:09.487478643 +0100
|
||||
--- a/drivers/usb/musb/Makefile
|
||||
+++ b/drivers/usb/musb/Makefile
|
||||
@@ -13,13 +13,13 @@ musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD) +
|
||||
musb_hdrc-$(CONFIG_DEBUG_FS) += musb_debugfs.o
|
||||
|
||||
@@ -101,10 +93,8 @@ Index: linux-2.6.38-rc7/drivers/usb/musb/Makefile
|
||||
|
||||
# the kconfig must guarantee that only one of the
|
||||
# possible I/O schemes will be enabled at a time ...
|
||||
Index: linux-2.6.38-rc7/drivers/usb/musb/musb_core.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc7.orig/drivers/usb/musb/musb_core.c 2011-03-06 18:50:23.538486528 +0100
|
||||
+++ linux-2.6.38-rc7/drivers/usb/musb/musb_core.c 2011-03-06 18:51:09.489478904 +0100
|
||||
--- a/drivers/usb/musb/musb_core.c
|
||||
+++ b/drivers/usb/musb/musb_core.c
|
||||
@@ -2427,8 +2427,13 @@ static struct platform_driver musb_drive
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/Kconfig 2011-03-01 19:56:10.396378152 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/Kconfig 2011-03-01 19:56:10.669365669 +0100
|
||||
--- a/drivers/cbus/Kconfig
|
||||
+++ b/drivers/cbus/Kconfig
|
||||
@@ -72,4 +72,12 @@ config CBUS_RETU_HEADSET
|
||||
to Retu/Vilma. Detection state and events are exposed through
|
||||
sysfs.
|
||||
@@ -15,10 +13,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
|
||||
+ If unsure, say N.
|
||||
+
|
||||
endmenu
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/Makefile 2011-03-01 19:56:10.396378152 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/Makefile 2011-03-01 19:56:10.669365669 +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-2.6.38-rc6/drivers/cbus/Makefile
|
||||
+n810bm-y += n810bm_main.o
|
||||
+n810bm-y += lipocharge.o
|
||||
+obj-$(CONFIG_N810BM) += n810bm.o
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/n810bm_main.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 2011-03-01 21:15:45.484648402 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/n810bm_main.c
|
||||
@@ -0,0 +1,1586 @@
|
||||
+/*
|
||||
+ * Nokia n810 battery management
|
||||
@@ -1617,10 +1611,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/n810bm_main.c
|
||||
+MODULE_FIRMWARE(N810BM_PMM_BLOCK_FILENAME);
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Michael Buesch");
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.c 2011-03-01 19:56:10.672365533 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/lipocharge.c
|
||||
@@ -0,0 +1,183 @@
|
||||
+/*
|
||||
+ * Generic LIPO battery charger
|
||||
@@ -1805,10 +1797,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.h 2011-03-01 21:07:15.483394264 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/cbus/lipocharge.h
|
||||
@@ -0,0 +1,60 @@
|
||||
+#ifndef LIPOCHARGE_H_
|
||||
+#define LIPOCHARGE_H_
|
||||
@@ -1870,10 +1860,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.h
|
||||
+}
|
||||
+
|
||||
+#endif /* LIPOCHARGE_H_ */
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/cbus.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/cbus.c 2011-03-01 19:56:10.396378152 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/cbus.c 2011-03-01 19:56:10.673365487 +0100
|
||||
--- a/drivers/cbus/cbus.c
|
||||
+++ b/drivers/cbus/cbus.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
@@ -1896,10 +1884,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/cbus.c
|
||||
MODULE_DESCRIPTION("CBUS serial protocol");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Juha Yrj<72>l<EFBFBD>");
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/cbus.h
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/cbus.h 2011-03-01 19:56:10.396378152 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/cbus.h 2011-03-01 19:56:10.673365487 +0100
|
||||
--- a/drivers/cbus/cbus.h
|
||||
+++ b/drivers/cbus/cbus.h
|
||||
@@ -26,4 +26,6 @@
|
||||
extern int cbus_read_reg(unsigned dev, unsigned reg);
|
||||
extern int cbus_write_reg(unsigned dev, unsigned reg, unsigned val);
|
||||
@@ -1907,10 +1893,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/cbus.h
|
||||
+NORET_TYPE void cbus_emergency(void) ATTRIB_NORET;
|
||||
+
|
||||
#endif /* __DRIVERS_CBUS_CBUS_H */
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-03-01 19:56:10.469374814 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-03-01 19:56:10.674365441 +0100
|
||||
--- a/drivers/cbus/retu.c
|
||||
+++ b/drivers/cbus/retu.c
|
||||
@@ -425,6 +425,11 @@ static int retu_allocate_children(struct
|
||||
if (!child)
|
||||
return -ENOMEM;
|
||||
@@ -1923,10 +1907,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu.c
|
||||
return 0;
|
||||
}
|
||||
|
||||
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c
|
||||
===================================================================
|
||||
--- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.c 2011-03-01 19:56:10.401377922 +0100
|
||||
+++ linux-2.6.38-rc6/drivers/cbus/tahvo.c 2011-03-01 19:56:10.674365441 +0100
|
||||
--- a/drivers/cbus/tahvo.c
|
||||
+++ b/drivers/cbus/tahvo.c
|
||||
@@ -54,6 +54,7 @@ static int tahvo_is_betty;
|
||||
|
||||
static struct tasklet_struct tahvo_tasklet;
|
||||
|
||||
Reference in New Issue
Block a user