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.

SVN-Revision: 26905
This commit is contained in:
Hauke Mehrtens 2011-05-15 17:23:02 +00:00
parent ec05877491
commit a4c0645326
69 changed files with 298 additions and 511 deletions

View file

@ -23,8 +23,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.37.6) ifeq ($(LINUX_VERSION),2.6.37.6)
LINUX_KERNEL_MD5SUM:=05970afdce8ec4323a10dcd42bc4fb0c LINUX_KERNEL_MD5SUM:=05970afdce8ec4323a10dcd42bc4fb0c
endif endif
ifeq ($(LINUX_VERSION),2.6.38.2) ifeq ($(LINUX_VERSION),2.6.38.6)
LINUX_KERNEL_MD5SUM:=5e9d0edae15053ea9acd932e6d162d03 LINUX_KERNEL_MD5SUM:=e896a3bb3185b8a8af8e2f010f63c02e
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

View file

@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
SUBTARGETS:=netus tqma9263 SUBTARGETS:=netus tqma9263
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
DEVICE_TYPE= DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

View file

@ -1,6 +1,6 @@
--- a/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig
@@ -282,7 +282,7 @@ comment "I2C system bus drivers (mostly @@ -283,7 +283,7 @@ comment "I2C system bus drivers (mostly
config I2C_AT91 config I2C_AT91
tristate "Atmel AT91 I2C Two-Wire interface (TWI)" tristate "Atmel AT91 I2C Two-Wire interface (TWI)"

View file

@ -1,8 +1,6 @@
Index: linux-2.6.38/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
=================================================================== +++ b/drivers/misc/Kconfig
--- linux-2.6.38.orig/drivers/misc/Kconfig 2011-03-15 02:20:32.000000000 +0100 @@ -104,6 +104,10 @@ config ATMEL_TCB_CLKSRC_BLOCK
+++ linux-2.6.38/drivers/misc/Kconfig 2011-03-20 22:54:33.114794033 +0100
@@ -104,6 +104,10 @@
TC can be used for other purposes, such as PWM generation and TC can be used for other purposes, such as PWM generation and
interval timing. interval timing.
@ -13,11 +11,9 @@ Index: linux-2.6.38/drivers/misc/Kconfig
config IBM_ASM config IBM_ASM
tristate "Device driver for IBM RSA service processor" tristate "Device driver for IBM RSA service processor"
depends on X86 && PCI && INPUT && EXPERIMENTAL depends on X86 && PCI && INPUT && EXPERIMENTAL
Index: linux-2.6.38/drivers/misc/Makefile --- a/drivers/misc/Makefile
=================================================================== +++ b/drivers/misc/Makefile
--- linux-2.6.38.orig/drivers/misc/Makefile 2011-03-15 02:20:32.000000000 +0100 @@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_
+++ linux-2.6.38/drivers/misc/Makefile 2011-03-20 22:55:18.000000000 +0100
@@ -9,6 +9,7 @@
obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o
obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
@ -25,4 +21,3 @@ Index: linux-2.6.38/drivers/misc/Makefile
obj-$(CONFIG_BMP085) += bmp085.o obj-$(CONFIG_BMP085) += bmp085.o
obj-$(CONFIG_ICS932S401) += ics932s401.o obj-$(CONFIG_ICS932S401) += ics932s401.o
obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_LKDTM) += lkdtm.o

View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/at91cap9_devices.c --- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@ void __init at91_add_device_usbh(struct
/* Enable VBus control for UHP ports */ /* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) { for (i = 0; i < data->ports; i++) {
if (data->vbus_pin[i]) if (data->vbus_pin[i])
@ -11,7 +11,7 @@
usbh_data = *data; usbh_data = *data;
--- a/arch/arm/mach-at91/at91sam9263_devices.c --- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@ void __init at91_add_device_usbh(struct
/* Enable VBus control for UHP ports */ /* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) { for (i = 0; i < data->ports; i++) {
if (data->vbus_pin[i]) if (data->vbus_pin[i])
@ -22,7 +22,7 @@
usbh_data = *data; usbh_data = *data;
--- a/arch/arm/mach-at91/at91sam9g45_devices.c --- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -119,7 +119,7 @@ @@ -121,7 +121,7 @@ void __init at91_add_device_usbh_ohci(st
/* Enable VBus control for UHP ports */ /* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) { for (i = 0; i < data->ports; i++) {
if (data->vbus_pin[i]) if (data->vbus_pin[i])
@ -31,7 +31,7 @@
} }
usbh_ohci_data = *data; usbh_ohci_data = *data;
@@ -174,7 +174,7 @@ @@ -176,7 +176,7 @@ void __init at91_add_device_usbh_ehci(st
/* Enable VBus control for UHP ports */ /* Enable VBus control for UHP ports */
for (i = 0; i < data->ports; i++) { for (i = 0; i < data->ports; i++) {
if (data->vbus_pin[i]) if (data->vbus_pin[i])
@ -42,7 +42,7 @@
usbh_ehci_data = *data; usbh_ehci_data = *data;
--- a/arch/arm/mach-at91/include/mach/board.h --- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h
@@ -93,8 +93,9 @@ @@ -96,8 +96,9 @@ extern void __init at91_add_device_eth(s
/* USB Host */ /* USB Host */
struct at91_usbh_data { struct at91_usbh_data {
@ -56,7 +56,7 @@
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data); extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
--- a/drivers/usb/host/ohci-at91.c --- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c
@@ -277,14 +277,13 @@ @@ -277,14 +277,13 @@ static int ohci_hcd_at91_drv_probe(struc
if (pdata) { if (pdata) {
/* REVISIT make the driver support per-port power switching, /* REVISIT make the driver support per-port power switching,
* and also overcurrent detection. Here we assume the ports * and also overcurrent detection. Here we assume the ports
@ -73,7 +73,7 @@
} }
} }
@@ -301,7 +300,7 @@ @@ -301,7 +300,7 @@ static int ohci_hcd_at91_drv_remove(stru
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) { for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
if (pdata->vbus_pin[i] <= 0) if (pdata->vbus_pin[i] <= 0)
continue; continue;

View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/Kconfig --- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig
@@ -317,6 +317,12 @@ @@ -318,6 +318,12 @@ config MACH_NEOCORE926
help help
Select this if you are using the Adeneo Neocore 926 board. Select this if you are using the Adeneo Neocore 926 board.
@ -15,7 +15,7 @@
# ---------------------------------------------------------- # ----------------------------------------------------------
--- a/arch/arm/mach-at91/Makefile --- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile
@@ -55,6 +55,7 @@ @@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o
obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o

View file

@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb
CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

View file

@ -29,7 +29,7 @@ of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file
#if defined(CONFIG_DEPRECATED_PARAM_STRUCT) #if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
#include "compat.h" #include "compat.h"
#endif #endif
@@ -989,9 +995,16 @@ static int c_show(struct seq_file *m, vo @@ -986,9 +992,16 @@ static int c_show(struct seq_file *m, vo
seq_puts(m, "\n"); seq_puts(m, "\n");
seq_printf(m, "Hardware\t: %s\n", machine_name); seq_printf(m, "Hardware\t: %s\n", machine_name);

View file

@ -2554,6 +2554,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TCP_CONG_WESTWOOD=y
# CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_CONG_YEAH is not set
# CONFIG_TCP_MD5SIG is not set # CONFIG_TCP_MD5SIG is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LIST_SORT is not set
# CONFIG_TEST_POWER is not set # CONFIG_TEST_POWER is not set
CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH=y

View file

@ -1,37 +0,0 @@
commit 8aa525a9340da4227797a06221ca08399006635f
Author: James Chapman <jchapman@katalix.com>
Date: Mon Mar 21 18:10:25 2011 -0700
l2tp: fix possible oops on l2tp_eth module unload
A struct used in the l2tp_eth driver for registering network namespace
ops was incorrectly marked as __net_initdata, leading to oops when
module unloaded.
BUG: unable to handle kernel paging request at ffffffffa00ec098
IP: [<ffffffff8123dbd8>] ops_exit_list+0x7/0x4b
PGD 142d067 PUD 1431063 PMD 195da8067 PTE 0
Oops: 0000 [#1] SMP
last sysfs file: /sys/module/l2tp_eth/refcnt
Call Trace:
[<ffffffff8123dc94>] ? unregister_pernet_operations+0x32/0x93
[<ffffffff8123dd20>] ? unregister_pernet_device+0x2b/0x38
[<ffffffff81068b6e>] ? sys_delete_module+0x1b8/0x222
[<ffffffff810c7300>] ? do_munmap+0x254/0x318
[<ffffffff812c64e5>] ? page_fault+0x25/0x30
[<ffffffff812c6952>] ? system_call_fastpath+0x16/0x1b
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -283,7 +283,7 @@ static __net_init int l2tp_eth_init_net(
return 0;
}
-static __net_initdata struct pernet_operations l2tp_eth_net_ops = {
+static struct pernet_operations l2tp_eth_net_ops = {
.init = l2tp_eth_init_net,
.id = &l2tp_eth_net_id,
.size = sizeof(struct l2tp_eth_net),

View file

@ -1,6 +1,6 @@
--- a/include/net/inet_ecn.h --- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h +++ b/include/net/inet_ecn.h
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner) @@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(
return outer; return outer;
} }

View file

@ -193,7 +193,7 @@
/* /*
* This function, given a master MTD object and a partition table, creates * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to * and registers slave MTD objects which are bound to the master according to
@@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info * @@ -652,6 +803,9 @@ int add_mtd_partitions(struct mtd_info *
struct mtd_part *slave; struct mtd_part *slave;
uint64_t cur_offset = 0; uint64_t cur_offset = 0;
int i; int i;
@ -203,7 +203,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
@@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info * @@ -666,6 +820,21 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
@ -225,7 +225,7 @@
cur_offset = slave->offset + slave->mtd.size; cur_offset = slave->offset + slave->mtd.size;
} }
@@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info * @@ -673,6 +842,32 @@ int add_mtd_partitions(struct mtd_info *
} }
EXPORT_SYMBOL(add_mtd_partitions); EXPORT_SYMBOL(add_mtd_partitions);

View file

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) + if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
if (retval == 0) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

View file

@ -1081,7 +1081,7 @@
ifdef CONFIG_FUNCTION_TRACER ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS) ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
@@ -71,6 +81,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/ @@ -73,6 +83,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
obj-$(CONFIG_LZO_DECOMPRESS) += lzo/ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
obj-$(CONFIG_XZ_DEC) += xz/ obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/ obj-$(CONFIG_RAID6_PQ) += raid6/

View file

@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -103,6 +103,9 @@ config ADM6996_PHY @@ -105,6 +105,9 @@ config ADM6996_PHY
---help--- Currently supports the ADM6996FC and ADM6996M switches.
Currently supports the ADM6996F switch Support for FC is very limited.
+config MVSWITCH_PHY +config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches" + tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -106,6 +106,10 @@ config ADM6996_PHY @@ -108,6 +108,10 @@ config ADM6996_PHY
config MVSWITCH_PHY config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches" tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -110,6 +110,10 @@ config IP17XX_PHY @@ -112,6 +112,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches" tristate "Driver for IC+ IP17xx switches"
select SWCONFIG select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -114,6 +114,10 @@ config AR8216_PHY @@ -116,6 +116,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches" tristate "Driver for Atheros AR8216 switches"
select SWCONFIG select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -156,4 +156,29 @@ config MDIO_OCTEON @@ -158,4 +158,29 @@ config MDIO_OCTEON
If in doubt, say Y. If in doubt, say Y.

View file

@ -160,7 +160,7 @@
--- a/kernel/pid.c --- a/kernel/pid.c
+++ b/kernel/pid.c +++ b/kernel/pid.c
@@ -424,6 +424,7 @@ struct task_struct *find_task_by_vpid(pi @@ -427,6 +427,7 @@ struct task_struct *find_task_by_vpid(pi
{ {
return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
} }

View file

@ -32,7 +32,7 @@
} }
--- a/fs/file.c --- a/fs/file.c
+++ b/fs/file.c +++ b/fs/file.c
@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
/* All good, so we try */ /* All good, so we try */
return expand_fdtable(files, nr); return expand_fdtable(files, nr);
} }
@ -88,7 +88,7 @@
/** /**
* zap_vma_ptes - remove ptes mapping the vma * zap_vma_ptes - remove ptes mapping the vma
@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode @@ -2701,6 +2702,7 @@ int vmtruncate_range(struct inode *inode
return 0; return 0;
} }
@ -116,7 +116,7 @@
void *caller) void *caller)
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -863,6 +863,7 @@ extern void show_free_areas(void); @@ -864,6 +864,7 @@ extern void show_free_areas(void);
int shmem_lock(struct file *file, int lock, struct user_struct *user); int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);

View file

@ -13,7 +13,7 @@ SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:= INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

View file

@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540
FEATURES:=spe_fpu ramdisk FEATURES:=spe_fpu ramdisk
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

View file

@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
MAINTAINER:=Michael Buesch <mb@bu3sch.de> MAINTAINER:=Michael Buesch <mb@bu3sch.de>
FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
define Target/Description define Target/Description
TI OMAP-24xx TI OMAP-24xx

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/arch/arm/plat-omap/bootreason.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
+/* +/*
+ * linux/arch/arm/plat-omap/bootreason.c + * 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); +late_initcall(bootreason_init);
Index: linux-2.6.38-rc6/arch/arm/plat-omap/common.c --- a/arch/arm/plat-omap/common.c
=================================================================== +++ b/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
@@ -21,17 +21,89 @@ @@ -21,17 +21,89 @@
#include <plat/vram.h> #include <plat/vram.h>
#include <plat/dsp.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 /* Try to find the config from the board-specific structures
* in the kernel. */ * in the kernel. */
for (i = 0; i < omap_board_config_size; i++) { for (i = 0; i < omap_board_config_size; i++) {
Index: linux-2.6.38-rc6/arch/arm/plat-omap/component-version.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/* +/*
+ * linux/arch/arm/plat-omap/component-version.c + * 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ölä <juha.yrjola@nokia.com>"); +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
+MODULE_DESCRIPTION("Component version driver"); +MODULE_DESCRIPTION("Component version driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig --- a/arch/arm/plat-omap/Kconfig
=================================================================== +++ b/arch/arm/plat-omap/Kconfig
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Kconfig 2011-02-25 01:10:25.621118611 +0100 @@ -79,6 +79,38 @@ config OMAP_RESET_CLOCKS
+++ linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig 2011-02-25 01:11:27.299563117 +0100
@@ -79,6 +79,38 @@
probably do not want this option enabled until your probably do not want this option enabled until your
device drivers work properly. device drivers work properly.
@ -288,11 +280,9 @@ Index: linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig
config OMAP_MUX config OMAP_MUX
bool "OMAP multiplexing support" bool "OMAP multiplexing support"
depends on ARCH_OMAP depends on ARCH_OMAP
Index: linux-2.6.38-rc6/arch/arm/plat-omap/Makefile --- a/arch/arm/plat-omap/Makefile
=================================================================== +++ b/arch/arm/plat-omap/Makefile
--- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Makefile 2011-02-25 01:10:25.604120958 +0100 @@ -23,6 +23,9 @@ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu-
+++ linux-2.6.38-rc6/arch/arm/plat-omap/Makefile 2011-02-25 01:11:27.299563117 +0100
@@ -23,6 +23,9 @@
obj-$(CONFIG_CPU_FREQ) += cpu-omap.o obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.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_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
Index: linux-2.6.38-rc6/arch/arm/include/asm/setup.h --- a/arch/arm/include/asm/setup.h
=================================================================== +++ b/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 @@ -136,6 +136,13 @@ struct tag_acorn {
+++ linux-2.6.38-rc6/arch/arm/include/asm/setup.h 2011-02-25 01:11:27.300562978 +0100
@@ -136,6 +136,13 @@
__u8 adfsdrives; __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 */ /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
#define ATAG_MEMCLK 0x41000402 #define ATAG_MEMCLK 0x41000402
@@ -162,6 +169,11 @@ @@ -162,6 +169,11 @@ struct tag {
struct tag_acorn acorn; struct tag_acorn acorn;
/* /*
@ -332,10 +320,8 @@ Index: linux-2.6.38-rc6/arch/arm/include/asm/setup.h
* DC21285 specific * DC21285 specific
*/ */
struct tag_memclk memclk; struct tag_memclk memclk;
Index: linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,554 @@ @@ -0,0 +1,554 @@
+/* +/*
+ * linux/arch/arm/plat-omap/gpio-switch.c + * 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ölä <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com"); +MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com");
+MODULE_DESCRIPTION("GPIO switch driver"); +MODULE_DESCRIPTION("GPIO switch driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/board.h --- a/arch/arm/plat-omap/include/plat/board.h
=================================================================== +++ b/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 @@ -151,6 +151,14 @@ struct omap_board_config_kernel {
+++ 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 @@
const void *data; const void *data;
}; };

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c --- a/arch/arm/mach-omap2/board-n8x0.c
=================================================================== +++ b/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
@@ -15,8 +15,10 @@ @@ -15,8 +15,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.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" #include "mux.h"
@@ -194,6 +197,114 @@ @@ -194,6 +197,114 @@ static struct omap_onenand_platform_data
}; };
#endif #endif
@ -136,7 +134,7 @@ Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c
#if defined(CONFIG_MENELAUS) && \ #if defined(CONFIG_MENELAUS) && \
(defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)) (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(); 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 #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) static void __init n8x0_init_machine(void)
{ {
omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC); 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 */ /* FIXME: add n810 spi devices */
spi_register_board_info(n800_spi_board_info, spi_register_board_info(n800_spi_board_info,
ARRAY_SIZE(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") MACHINE_START(NOKIA_N800, "Nokia N800")
.boot_params = 0x80000100, .boot_params = 0x80000100,

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c --- a/arch/arm/mach-omap2/board-n8x0.c
=================================================================== +++ b/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
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/usb/musb.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); gpmc_onenand_init(board_onenand_data);
n8x0_mmc_init(); n8x0_mmc_init();
n8x0_usb_init(); n8x0_usb_init();
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,141 @@ @@ -0,0 +1,141 @@
+/* +/*
+ * linux/arch/arm/mach-omap2/board-n8x0.c + * 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"); + printk(KERN_INFO "N8x0 Blizzard initialized");
+} +}
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile --- a/arch/arm/mach-omap2/Makefile
=================================================================== +++ b/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
@@ -177,6 +177,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar @@ -177,6 +177,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar
hsmmc.o \ hsmmc.o \
board-flash.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 \ obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o \
sdram-nokia.o \ sdram-nokia.o \
hsmmc.o hsmmc.o
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
+ * cbus.h - CBUS platform_data definition + * 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 */ +#endif /* __PLAT_CBUS_H */
Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h --- a/arch/arm/plat-omap/include/plat/irqs.h
=================================================================== +++ b/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
@@ -411,7 +411,20 @@ @@ -411,7 +411,20 @@
#define TWL_IRQ_END TWL6030_IRQ_END #define TWL_IRQ_END TWL6030_IRQ_END
#endif #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)) #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/omap_hwmod_2420_data.c --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
=================================================================== +++ b/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
@@ -673,6 +673,7 @@ static struct omap_hwmod_ocp_if *omap242 @@ -673,6 +673,7 @@ static struct omap_hwmod_ocp_if *omap242
static struct omap_hwmod omap2420_gpio1_hwmod = { static struct omap_hwmod omap2420_gpio1_hwmod = {

View file

@ -2,11 +2,9 @@
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.38-rc6/arch/arm/mach-omap2/board-n8x0.c --- a/arch/arm/mach-omap2/board-n8x0.c
=================================================================== +++ b/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 @@ -225,6 +225,77 @@ extern struct mipid_platform_data n8x0_m
+++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:55:54.570320630 +0100
@@ -225,6 +225,77 @@
extern void n8x0_mipid_init(void); extern void n8x0_mipid_init(void);
extern void n8x0_blizzard_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 = { static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = {
{ {
.name = "headphone", .name = "headphone",
@@ -246,11 +317,13 @@ @@ -246,11 +317,13 @@ static struct omap_gpio_switch n8x0_gpio
.gpio = -1, .gpio = -1,
.debounce_rising = 200, .debounce_rising = 200,
.debounce_falling = 200, .debounce_falling = 200,

View file

@ -11,10 +11,8 @@
drivers/bluetooth/hci_h4p/uart.c | 169 +++++ drivers/bluetooth/hci_h4p/uart.c | 169 +++++
10 files changed, 1891 insertions(+) 10 files changed, 1891 insertions(+)
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,1043 @@ @@ -0,0 +1,1043 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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_DESCRIPTION("h4 driver with nokia extensions");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ville Tervo"); +MODULE_AUTHOR("Ville Tervo");
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,155 @@ @@ -0,0 +1,155 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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; + return;
+} +}
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,149 @@ @@ -0,0 +1,149 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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; + return 0;
+} +}
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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; + return 0;
+} +}
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/hci_h4p.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,183 @@ @@ -0,0 +1,183 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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); +int hci_h4p_init_uart(struct hci_h4p_info *info);
+ +
+#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */ +#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/Makefile --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+# +#
+# Makefile for the Linux Bluetooth HCI device drivers. +# 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 +obj-$(CONFIG_BT_HCIH4P) += hci_h4p.o
+ +
+hci_h4p-objs := core.o fw.o uart.o sysfs.o fw-ti.o fw-csr.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
=================================================================== +++ b/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
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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 +#endif
Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,169 @@ @@ -0,0 +1,169 @@
+/* +/*
+ * This file is part of hci_h4p bluetooth driver + * 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; + return 0;
+} +}
Index: linux-2.6.37-rc1/drivers/bluetooth/Kconfig --- a/drivers/bluetooth/Kconfig
=================================================================== +++ b/drivers/bluetooth/Kconfig
--- linux-2.6.37-rc1.orig/drivers/bluetooth/Kconfig 2010-11-01 12:54:12.000000000 +0100 @@ -173,6 +173,16 @@ config BT_HCIBTUART
+++ linux-2.6.37-rc1/drivers/bluetooth/Kconfig 2010-11-05 17:04:44.762000001 +0100
@@ -173,6 +173,16 @@
Say Y here to compile support for HCI UART devices into the Say Y here to compile support for HCI UART devices into the
kernel or say M to compile it as module (btuart_cs). 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 config BT_HCIVHCI
tristate "HCI VHCI (Virtual HCI device) driver" tristate "HCI VHCI (Virtual HCI device) driver"
help help
Index: linux-2.6.37-rc1/drivers/bluetooth/Makefile --- a/drivers/bluetooth/Makefile
=================================================================== +++ b/drivers/bluetooth/Makefile
--- linux-2.6.37-rc1.orig/drivers/bluetooth/Makefile 2010-11-01 12:54:12.000000000 +0100 @@ -11,6 +11,7 @@ obj-$(CONFIG_BT_HCIDTL1) += dtl1_cs.o
+++ linux-2.6.37-rc1/drivers/bluetooth/Makefile 2010-11-05 17:04:44.763000001 +0100
@@ -11,6 +11,7 @@
obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o
obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o
obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c --- a/drivers/bluetooth/hci_h4p/core.c
=================================================================== +++ b/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
@@ -36,9 +36,9 @@ @@ -36,9 +36,9 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/gpio.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 <plat/serial.h>
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h --- a/drivers/bluetooth/hci_h4p/hci_h4p.h
=================================================================== +++ b/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
@@ -21,7 +21,7 @@ @@ -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/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c --- a/drivers/bluetooth/hci_h4p/sysfs.c
=================================================================== +++ b/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
@@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru @@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru
return -EINVAL; return -EINVAL;
} }

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
=================================================================== +++ b/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
@@ -362,7 +362,7 @@ static struct omap_hwmod_class uart_clas @@ -362,7 +362,7 @@ static struct omap_hwmod_class uart_clas
/* UART1 */ /* 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[] = { static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c --- a/arch/arm/mach-omap2/serial.c
=================================================================== +++ b/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
@@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o @@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o
uart->padconf = 0; uart->padconf = 0;
} }

View file

@ -19,10 +19,8 @@
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.38-rc6/drivers/cbus/cbus.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,332 @@ @@ -0,0 +1,332 @@
+/* +/*
+ * drivers/cbus/cbus.c + * drivers/cbus/cbus.c
@ -356,10 +354,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/cbus.c
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+ +
Index: linux-2.6.38-rc6/drivers/cbus/cbus.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+/* +/*
+ * drivers/cbus/cbus.h + * 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); +extern int cbus_write_reg(unsigned dev, unsigned reg, unsigned val);
+ +
+#endif /* __DRIVERS_CBUS_CBUS_H */ +#endif /* __DRIVERS_CBUS_CBUS_H */
Index: linux-2.6.38-rc6/drivers/cbus/Kconfig --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
+# +#
+# CBUS device configuration +# CBUS device configuration
@ -470,10 +464,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
+ sysfs. + sysfs.
+ +
+endmenu +endmenu
Index: linux-2.6.38-rc6/drivers/cbus/Makefile --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+# +#
+# Makefile for CBUS. +# 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_RTC) += retu-rtc.o
+obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o +obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o
+obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o +obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o
Index: linux-2.6.38-rc6/drivers/cbus/retu.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,544 @@ @@ -0,0 +1,544 @@
+/** +/**
+ * drivers/cbus/retu.c + * drivers/cbus/retu.c
@ -1037,10 +1027,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu.c
+MODULE_AUTHOR("Juha Yrjölä"); +MODULE_AUTHOR("Juha Yrjölä");
+MODULE_AUTHOR("David Weinehall"); +MODULE_AUTHOR("David Weinehall");
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
Index: linux-2.6.38-rc6/drivers/cbus/retu.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+/** +/**
+ * drivers/cbus/retu.h + * 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); +int retu_read_adc(struct device *child, int channel);
+ +
+#endif /* __DRIVERS_CBUS_RETU_H */ +#endif /* __DRIVERS_CBUS_RETU_H */
Index: linux-2.6.38-rc6/drivers/cbus/retu-headset.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,359 @@ @@ -0,0 +1,359 @@
+/** +/**
+ * Retu/Vilma headset detection + * 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_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.38-rc6/drivers/cbus/retu-pwrbutton.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,165 @@ @@ -0,0 +1,165 @@
+/** +/**
+ * drivers/cbus/retu-pwrbutton.c + * 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("Ari Saastamoinen");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+ +
Index: linux-2.6.38-rc6/drivers/cbus/retu-rtc.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,287 @@ @@ -0,0 +1,287 @@
+/** +/**
+ * drivers/cbus/retu-rtc.c + * 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("Igor Stoppa");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+ +
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,358 @@ @@ -0,0 +1,358 @@
+/** +/**
+ * drivers/cbus/retu-wdt.c + * 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_AUTHOR("Amit Kucheria");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+ +
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,391 @@ @@ -0,0 +1,391 @@
+/** +/**
+ * drivers/cbus/tahvo.c + * drivers/cbus/tahvo.c
@ -2693,10 +2671,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c
+MODULE_AUTHOR("David Weinehall"); +MODULE_AUTHOR("David Weinehall");
+MODULE_AUTHOR("Mikko Ylinen"); +MODULE_AUTHOR("Mikko Ylinen");
+ +
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* +/*
+ * drivers/cbus/tahvo.h + * drivers/cbus/tahvo.h
@ -2755,10 +2731,8 @@ Index: linux-2.6.38-rc6/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.38-rc6/drivers/cbus/tahvo-usb.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,773 @@ @@ -0,0 +1,773 @@
+/** +/**
+ * drivers/cbus/tahvo-usb.c + * 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_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.38-rc6/drivers/Makefile --- a/drivers/Makefile
=================================================================== +++ b/drivers/Makefile
--- linux-2.6.38-rc6.orig/drivers/Makefile 2011-02-24 12:03:07.439316519 +0100 @@ -74,7 +74,7 @@ obj-$(CONFIG_GAMEPORT) += input/gamepor
+++ linux-2.6.38-rc6/drivers/Makefile 2011-02-24 12:03:27.457522207 +0100
@@ -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/
@ -3546,11 +3518,9 @@ Index: linux-2.6.38-rc6/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.38-rc6/arch/arm/Kconfig --- a/arch/arm/Kconfig
=================================================================== +++ b/arch/arm/Kconfig
--- linux-2.6.38-rc6.orig/arch/arm/Kconfig 2011-02-24 12:03:07.286322589 +0100 @@ -1930,6 +1930,10 @@ source "net/Kconfig"
+++ linux-2.6.38-rc6/arch/arm/Kconfig 2011-02-24 12:03:27.458522167 +0100
@@ -1930,6 +1930,10 @@
source "drivers/Kconfig" source "drivers/Kconfig"

View file

@ -1,8 +1,6 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu.c --- a/drivers/cbus/retu.c
=================================================================== +++ b/drivers/cbus/retu.c
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-27 18:01:26.306458689 +0100 @@ -205,7 +205,7 @@ static irqreturn_t retu_irq_handler(int
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-27 18:05:56.472263901 +0100
@@ -205,7 +205,7 @@
return IRQ_NONE; return IRQ_NONE;
} }

View file

@ -1,8 +1,6 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu.c --- a/drivers/cbus/retu.c
=================================================================== +++ b/drivers/cbus/retu.c
--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-26 23:23:34.014429906 +0100 @@ -120,7 +120,9 @@ void retu_write_reg(struct device *child
+++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-26 23:25:18.905358127 +0100
@@ -120,7 +120,9 @@
{ {
struct retu *retu = dev_get_drvdata(child->parent); struct retu *retu = dev_get_drvdata(child->parent);

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu.c --- a/drivers/cbus/retu.c
=================================================================== +++ b/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
@@ -198,10 +198,12 @@ static irqreturn_t retu_irq_handler(int @@ -198,10 +198,12 @@ static irqreturn_t retu_irq_handler(int
u16 idr; u16 idr;
u16 imr; u16 imr;

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu.h --- a/drivers/cbus/retu.h
=================================================================== +++ b/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
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
#define RETU_REG_CTRL_CLR 0x0f /* Regulator clear register */ #define RETU_REG_CTRL_CLR 0x0f /* Regulator clear register */
#define RETU_REG_CTRL_SET 0x10 /* Regulator set register */ #define RETU_REG_CTRL_SET 0x10 /* Regulator set register */

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h --- a/drivers/cbus/tahvo.h
=================================================================== +++ b/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
@@ -30,12 +30,23 @@ @@ -30,12 +30,23 @@
#define TAHVO_REG_IDR 0x01 /* Interrupt ID */ #define TAHVO_REG_IDR 0x01 /* Interrupt ID */
#define TAHVO_REG_IDSR 0x02 /* Interrupt status */ #define TAHVO_REG_IDSR 0x02 /* Interrupt status */

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -58,13 +58,11 @@ struct retu_wdt_dev { @@ -58,13 +58,11 @@ struct retu_wdt_dev {
struct device *dev; struct device *dev;
int users; int users;

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -56,7 +56,7 @@ static int counter_param = RETU_WDT_MAX_ @@ -56,7 +56,7 @@ static int counter_param = RETU_WDT_MAX_
struct retu_wdt_dev { struct retu_wdt_dev {

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -52,7 +52,6 @@ static DEFINE_MUTEX(retu_wdt_mutex); @@ -52,7 +52,6 @@ static DEFINE_MUTEX(retu_wdt_mutex);
/* Current period of watchdog */ /* Current period of watchdog */

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -124,9 +124,9 @@ static int retu_wdt_release(struct inode @@ -124,9 +124,9 @@ static int retu_wdt_release(struct inode
struct retu_wdt_dev *wdev = file->private_data; struct retu_wdt_dev *wdev = file->private_data;

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
* *
* Written by Amit Kucheria <amit.kucheria@nokia.com> * Written by Amit Kucheria <amit.kucheria@nokia.com>

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c --- a/drivers/cbus/retu-wdt.c
=================================================================== +++ b/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
@@ -149,7 +149,7 @@ static long retu_wdt_ioctl(struct file * @@ -149,7 +149,7 @@ static long retu_wdt_ioctl(struct file *
struct retu_wdt_dev *wdev = container_of(mdev, struct retu_wdt_dev, miscdev); struct retu_wdt_dev *wdev = container_of(mdev, struct retu_wdt_dev, miscdev);
int new_margin; int new_margin;

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c --- a/drivers/cbus/tahvo-usb.c
=================================================================== +++ b/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
@@ -99,7 +99,7 @@ struct tahvo_usb { @@ -99,7 +99,7 @@ struct tahvo_usb {
int tahvo_mode; int tahvo_mode;
#endif #endif

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c --- a/drivers/cbus/tahvo-usb.c
=================================================================== +++ b/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
@@ -725,6 +725,8 @@ static int __init tahvo_usb_probe(struct @@ -725,6 +725,8 @@ static int __init tahvo_usb_probe(struct
static int __exit tahvo_usb_remove(struct platform_device *pdev) static int __exit tahvo_usb_remove(struct platform_device *pdev)

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c --- a/drivers/cbus/tahvo-usb.c
=================================================================== +++ b/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
@@ -98,6 +98,7 @@ struct tahvo_usb { @@ -98,6 +98,7 @@ struct tahvo_usb {
#ifdef CONFIG_USB_OTG #ifdef CONFIG_USB_OTG
int tahvo_mode; int tahvo_mode;

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/board-n8x0.c --- a/arch/arm/mach-omap2/board-n8x0.c
=================================================================== +++ b/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
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#include <plat/serial.h> #include <plat/serial.h>
#include <plat/cbus.h> #include <plat/cbus.h>

View file

@ -5,11 +5,9 @@
include/linux/spi/tsc2005.h | 30 + include/linux/spi/tsc2005.h | 30 +
4 files changed, 1000 insertions(+) 4 files changed, 1000 insertions(+)
Index: linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig --- a/drivers/input/touchscreen/Kconfig
=================================================================== +++ b/drivers/input/touchscreen/Kconfig
--- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Kconfig 2011-02-22 02:25:52.000000000 +0100 @@ -629,6 +629,17 @@ config TOUCHSCREEN_TOUCHIT213
+++ linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig 2011-02-24 00:23:46.456893349 +0100
@@ -629,6 +629,17 @@
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called touchit213. module will be called touchit213.
@ -27,11 +25,9 @@ Index: linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig
config TOUCHSCREEN_TSC2007 config TOUCHSCREEN_TSC2007
tristate "TSC2007 based touchscreens" tristate "TSC2007 based touchscreens"
depends on I2C depends on I2C
Index: linux-2.6.38-rc6/drivers/input/touchscreen/Makefile --- a/drivers/input/touchscreen/Makefile
=================================================================== +++ b/drivers/input/touchscreen/Makefile
--- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Makefile 2011-02-22 02:25:52.000000000 +0100 @@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += t
+++ linux-2.6.38-rc6/drivers/input/touchscreen/Makefile 2011-02-24 00:23:46.457893305 +0100
@@ -45,6 +45,7 @@
obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.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_TSC2007) += tsc2007.o
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
Index: linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,958 @@ @@ -0,0 +1,958 @@
+/* +/*
+ * TSC2005 touchscreen driver + * 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_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:tsc2005"); +MODULE_ALIAS("platform:tsc2005");
Index: linux-2.6.38-rc6/include/linux/spi/tsc2005.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+#ifndef _LINUX_SPI_TSC2005_H +#ifndef _LINUX_SPI_TSC2005_H
+#define _LINUX_SPI_TSC2005_H +#define _LINUX_SPI_TSC2005_H

View file

@ -2,11 +2,9 @@
drivers/input/evdev.c | 10 +++++++--- drivers/input/evdev.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-) 1 file changed, 7 insertions(+), 3 deletions(-)
Index: linux-2.6.38-rc6/drivers/input/evdev.c --- a/drivers/input/evdev.c
=================================================================== +++ b/drivers/input/evdev.c
--- linux-2.6.38-rc6.orig/drivers/input/evdev.c 2011-02-22 02:25:52.000000000 +0100 @@ -78,7 +78,7 @@ static void evdev_event(struct input_han
+++ linux-2.6.38-rc6/drivers/input/evdev.c 2011-02-24 00:23:52.155643164 +0100
@@ -78,7 +78,7 @@
unsigned int type, unsigned int code, int value) unsigned int type, unsigned int code, int value)
{ {
struct evdev *evdev = handle->private; struct evdev *evdev = handle->private;
@ -15,7 +13,7 @@ Index: linux-2.6.38-rc6/drivers/input/evdev.c
struct input_event event; struct input_event event;
do_gettimeofday(&event.time); do_gettimeofday(&event.time);
@@ -89,9 +89,13 @@ @@ -89,9 +89,13 @@ static void evdev_event(struct input_han
rcu_read_lock(); rcu_read_lock();
client = rcu_dereference(evdev->grab); client = rcu_dereference(evdev->grab);

View file

@ -1,8 +1,6 @@
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c --- a/drivers/mmc/host/omap.c
=================================================================== +++ b/drivers/mmc/host/omap.c
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100 @@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct
+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 00:58:54.735744872 +0100
@@ -1456,6 +1456,7 @@
host->dma_ch = -1; host->dma_ch = -1;
host->irq = irq; 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->phys_base = host->mem_res->start;
host->virt_base = ioremap(res->start, res->end - res->start + 1); host->virt_base = ioremap(res->start, res->end - res->start + 1);
if (!host->virt_base) 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; return 0;
Index: linux-2.6.38-rc6/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c
=================================================================== +++ b/drivers/mmc/core/core.c
--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100 @@ -75,12 +75,13 @@ static int mmc_schedule_delayed_work(str
+++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-27 00:57:32.633556994 +0100
@@ -75,12 +75,13 @@
} }
/* /*
@ -41,11 +37,9 @@ Index: linux-2.6.38-rc6/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.38-rc6/include/linux/mmc/host.h --- a/include/linux/mmc/host.h
=================================================================== +++ b/include/linux/mmc/host.h
--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100 @@ -325,5 +325,7 @@ static inline int mmc_card_is_powered_re
+++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-27 00:57:32.633556994 +0100
@@ -326,5 +326,7 @@
return host->pm_flags & MMC_PM_KEEP_POWER; return host->pm_flags & MMC_PM_KEEP_POWER;
} }

View file

@ -1,8 +1,6 @@
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c --- a/drivers/mmc/host/omap.c
=================================================================== +++ b/drivers/mmc/host/omap.c
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-27 16:56:51.714348509 +0100 @@ -832,7 +832,7 @@ static irqreturn_t mmc_omap_irq(int irq,
+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 16:57:30.796529124 +0100
@@ -832,7 +832,7 @@
return IRQ_HANDLED; return IRQ_HANDLED;
} }

View file

@ -2,11 +2,9 @@
arch/arm/mach-omap2/board-n8x0-lcd.c | 18 ++++++++++++++++++ arch/arm/mach-omap2/board-n8x0-lcd.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+) 1 file changed, 18 insertions(+)
Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c --- a/arch/arm/mach-omap2/board-n8x0-lcd.c
=================================================================== +++ b/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 @@ -34,8 +34,26 @@ static void mipid_shutdown(struct mipid_
+++ 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 @@
} }
} }

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c --- a/arch/arm/mach-omap2/serial.c
=================================================================== +++ b/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
@@ -660,6 +660,8 @@ static void serial_out_override(struct u @@ -660,6 +660,8 @@ static void serial_out_override(struct u
} }
#endif #endif

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc7/drivers/Makefile --- a/drivers/Makefile
=================================================================== +++ b/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
@@ -66,7 +66,7 @@ obj-$(CONFIG_TC) += tc/ @@ -66,7 +66,7 @@ obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_UWB) += uwb/ obj-$(CONFIG_UWB) += uwb/
obj-$(CONFIG_USB_OTG_UTILS) += usb/otg/ 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_PCI) += usb/
obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_USB_GADGET) += usb/gadget/
obj-$(CONFIG_SERIO) += input/serio/ obj-$(CONFIG_SERIO) += input/serio/
Index: linux-2.6.38-rc7/drivers/usb/musb/Kconfig --- a/drivers/usb/musb/Kconfig
=================================================================== +++ b/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
@@ -46,7 +46,7 @@ config USB_MUSB_DA8XX @@ -46,7 +46,7 @@ config USB_MUSB_DA8XX
depends on ARCH_DAVINCI_DA8XX depends on ARCH_DAVINCI_DA8XX
@ -24,10 +20,8 @@ Index: linux-2.6.38-rc7/drivers/usb/musb/Kconfig
depends on ARCH_OMAP depends on ARCH_OMAP
config USB_MUSB_OMAP2PLUS config USB_MUSB_OMAP2PLUS
Index: linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c --- a/drivers/usb/musb/tusb6010.c
=================================================================== +++ b/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
@@ -55,6 +55,7 @@ u8 tusb_get_revision(struct musb *musb) @@ -55,6 +55,7 @@ u8 tusb_get_revision(struct musb *musb)
return rev; return rev;
@ -76,10 +70,8 @@ Index: linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c
platform_driver_unregister(&tusb_driver); platform_driver_unregister(&tusb_driver);
} }
-module_exit(tusb_exit); -module_exit(tusb_exit);
Index: linux-2.6.38-rc7/drivers/usb/musb/Makefile --- a/drivers/usb/musb/Makefile
=================================================================== +++ b/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
@@ -13,13 +13,13 @@ musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD) + @@ -13,13 +13,13 @@ musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD) +
musb_hdrc-$(CONFIG_DEBUG_FS) += musb_debugfs.o 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 # the kconfig must guarantee that only one of the
# possible I/O schemes will be enabled at a time ... # possible I/O schemes will be enabled at a time ...
Index: linux-2.6.38-rc7/drivers/usb/musb/musb_core.c --- a/drivers/usb/musb/musb_core.c
=================================================================== +++ b/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
@@ -2427,8 +2427,13 @@ static struct platform_driver musb_drive @@ -2427,8 +2427,13 @@ static struct platform_driver musb_drive
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/

View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/cbus/Kconfig --- a/drivers/cbus/Kconfig
=================================================================== +++ b/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
@@ -72,4 +72,12 @@ config CBUS_RETU_HEADSET @@ -72,4 +72,12 @@ config CBUS_RETU_HEADSET
to Retu/Vilma. Detection state and events are exposed through to Retu/Vilma. Detection state and events are exposed through
sysfs. sysfs.
@ -15,10 +13,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/Kconfig
+ If unsure, say N. + If unsure, say N.
+ +
endmenu endmenu
Index: linux-2.6.38-rc6/drivers/cbus/Makefile --- a/drivers/cbus/Makefile
=================================================================== +++ b/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
@@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r @@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r
obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o
obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.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 += n810bm_main.o
+n810bm-y += lipocharge.o +n810bm-y += lipocharge.o
+obj-$(CONFIG_N810BM) += n810bm.o +obj-$(CONFIG_N810BM) += n810bm.o
Index: linux-2.6.38-rc6/drivers/cbus/n810bm_main.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,1586 @@ @@ -0,0 +1,1586 @@
+/* +/*
+ * Nokia n810 battery management + * 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_FIRMWARE(N810BM_PMM_BLOCK_FILENAME);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Michael Buesch"); +MODULE_AUTHOR("Michael Buesch");
Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,183 @@ @@ -0,0 +1,183 @@
+/* +/*
+ * Generic LIPO battery charger + * Generic LIPO battery charger
@ -1805,10 +1797,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.c
+ +
+ return 0; + return 0;
+} +}
Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.h --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+#ifndef LIPOCHARGE_H_ +#ifndef LIPOCHARGE_H_
+#define LIPOCHARGE_H_ +#define LIPOCHARGE_H_
@ -1870,10 +1860,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.h
+} +}
+ +
+#endif /* LIPOCHARGE_H_ */ +#endif /* LIPOCHARGE_H_ */
Index: linux-2.6.38-rc6/drivers/cbus/cbus.c --- a/drivers/cbus/cbus.c
=================================================================== +++ b/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
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
#include <linux/platform_device.h> #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_DESCRIPTION("CBUS serial protocol");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Juha Yrjölä"); MODULE_AUTHOR("Juha Yrjölä");
Index: linux-2.6.38-rc6/drivers/cbus/cbus.h --- a/drivers/cbus/cbus.h
=================================================================== +++ b/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
@@ -26,4 +26,6 @@ @@ -26,4 +26,6 @@
extern int cbus_read_reg(unsigned dev, unsigned reg); extern int cbus_read_reg(unsigned dev, unsigned reg);
extern int cbus_write_reg(unsigned dev, unsigned reg, unsigned val); 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; +NORET_TYPE void cbus_emergency(void) ATTRIB_NORET;
+ +
#endif /* __DRIVERS_CBUS_CBUS_H */ #endif /* __DRIVERS_CBUS_CBUS_H */
Index: linux-2.6.38-rc6/drivers/cbus/retu.c --- a/drivers/cbus/retu.c
=================================================================== +++ b/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
@@ -425,6 +425,11 @@ static int retu_allocate_children(struct @@ -425,6 +425,11 @@ static int retu_allocate_children(struct
if (!child) if (!child)
return -ENOMEM; return -ENOMEM;
@ -1923,10 +1907,8 @@ Index: linux-2.6.38-rc6/drivers/cbus/retu.c
return 0; return 0;
} }
Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c --- a/drivers/cbus/tahvo.c
=================================================================== +++ b/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
@@ -54,6 +54,7 @@ static int tahvo_is_betty; @@ -54,6 +54,7 @@ static int tahvo_is_betty;
static struct tasklet_struct tahvo_tasklet; static struct tasklet_struct tahvo_tasklet;

View file

@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=ext4 audio FEATURES:=ext4 audio
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=2.6.38.2 LINUX_VERSION:=2.6.38.6
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk