diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-15 17:23:02 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-15 17:23:02 +0000 |
| commit | f708e805736f9ba326e4fa4d4ffe3adc05f999b7 (patch) | |
| tree | 327a63216af1cc1f8e96c29c62803f2582694317 /target/linux | |
| parent | 463ae018b18088e4994bf4031c26bd76104771ce (diff) | |
| download | upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.tar.gz upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.tar.bz2 upstream-f708e805736f9ba326e4fa4d4ffe3adc05f999b7.zip | |
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
Diffstat (limited to 'target/linux')
68 files changed, 296 insertions, 509 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index f285c2c16d..33dfa9a43b 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves SUBTARGETS:=netus tqma9263 -LINUX_VERSION:=2.6.38.2 +LINUX_VERSION:=2.6.38.6 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/patches/100-at91_i2c.patch b/target/linux/at91/patches/100-at91_i2c.patch index 009feb84e6..e78ffde08b 100644 --- a/target/linux/at91/patches/100-at91_i2c.patch +++ b/target/linux/at91/patches/100-at91_i2c.patch @@ -1,6 +1,6 @@ --- a/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 tristate "Atmel AT91 I2C Two-Wire interface (TWI)" diff --git a/target/linux/at91/patches/200-experimenta_adc_driver.patch b/target/linux/at91/patches/200-experimenta_adc_driver.patch index 625b377976..48bb61e368 100644 --- a/target/linux/at91/patches/200-experimenta_adc_driver.patch +++ b/target/linux/at91/patches/200-experimenta_adc_driver.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.38/drivers/misc/Kconfig -=================================================================== ---- linux-2.6.38.orig/drivers/misc/Kconfig 2011-03-15 02:20:32.000000000 +0100 -+++ linux-2.6.38/drivers/misc/Kconfig 2011-03-20 22:54:33.114794033 +0100 -@@ -104,6 +104,10 @@ +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig +@@ -104,6 +104,10 @@ config ATMEL_TCB_CLKSRC_BLOCK TC can be used for other purposes, such as PWM generation and interval timing. @@ -13,11 +11,9 @@ Index: linux-2.6.38/drivers/misc/Kconfig config IBM_ASM tristate "Device driver for IBM RSA service processor" depends on X86 && PCI && INPUT && EXPERIMENTAL -Index: linux-2.6.38/drivers/misc/Makefile -=================================================================== ---- linux-2.6.38.orig/drivers/misc/Makefile 2011-03-15 02:20:32.000000000 +0100 -+++ linux-2.6.38/drivers/misc/Makefile 2011-03-20 22:55:18.000000000 +0100 -@@ -9,6 +9,7 @@ +--- a/drivers/misc/Makefile ++++ b/drivers/misc/Makefile +@@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_ obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.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_ICS932S401) += ics932s401.o obj-$(CONFIG_LKDTM) += lkdtm.o - diff --git a/target/linux/at91/patches/600-usb_vbus_active_high.patch b/target/linux/at91/patches/600-usb_vbus_active_high.patch index 0a55ac69a4..08dfcb3032 100644 --- a/target/linux/at91/patches/600-usb_vbus_active_high.patch +++ b/target/linux/at91/patches/600-usb_vbus_active_high.patch @@ -1,6 +1,6 @@ --- a/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 */ for (i = 0; i < data->ports; i++) { if (data->vbus_pin[i]) @@ -11,7 +11,7 @@ usbh_data = *data; --- a/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 */ for (i = 0; i < data->ports; i++) { if (data->vbus_pin[i]) @@ -22,7 +22,7 @@ usbh_data = *data; --- a/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 */ for (i = 0; i < data->ports; i++) { if (data->vbus_pin[i]) @@ -31,7 +31,7 @@ } 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 */ for (i = 0; i < data->ports; i++) { if (data->vbus_pin[i]) @@ -42,7 +42,7 @@ usbh_ehci_data = *data; --- a/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 */ struct at91_usbh_data { @@ -56,7 +56,7 @@ extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data); --- a/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) { /* REVISIT make the driver support per-port power switching, * 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++) { if (pdata->vbus_pin[i] <= 0) continue; diff --git a/target/linux/at91/patches/700-tqma9263-support.patch b/target/linux/at91/patches/700-tqma9263-support.patch index 941b4a6654..649d0d77da 100644 --- a/target/linux/at91/patches/700-tqma9263-support.patch +++ b/target/linux/at91/patches/700-tqma9263-support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig -@@ -317,6 +317,12 @@ +@@ -318,6 +318,12 @@ config MACH_NEOCORE926 help Select this if you are using the Adeneo Neocore 926 board. @@ -15,7 +15,7 @@ # ---------------------------------------------------------- --- a/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_USB_A9263) += board-usb-a9263.o obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index 0a53a79c29..7f617a22e1 100644 --- a/target/linux/ep93xx/Makefile +++ b/target/linux/ep93xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=2.6.38.2 +LINUX_VERSION:=2.6.38.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ep93xx/patches-2.6.38/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-2.6.38/001-ep93xx_cpuinfo.patch index 68099c5b60..1f0c5e67d8 100644 --- a/target/linux/ep93xx/patches-2.6.38/001-ep93xx_cpuinfo.patch +++ b/target/linux/ep93xx/patches-2.6.38/001-ep93xx_cpuinfo.patch @@ -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) #include "compat.h" #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_printf(m, "Hardware\t: %s\n", machine_name); diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38 index e5ad50ac5d..bec0ee94be 100644 --- a/target/linux/generic/config-2.6.38 +++ b/target/linux/generic/config-2.6.38 @@ -2554,6 +2554,7 @@ CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set +# CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_POWER is not set CONFIG_TEXTSEARCH=y diff --git a/target/linux/generic/patches-2.6.38/010-l2tp_fix_oops_backport.patch b/target/linux/generic/patches-2.6.38/010-l2tp_fix_oops_backport.patch deleted file mode 100644 index d8b7b5ad3d..0000000000 --- a/target/linux/generic/patches-2.6.38/010-l2tp_fix_oops_backport.patch +++ /dev/null @@ -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), diff --git a/target/linux/generic/patches-2.6.38/020-ssb_update.patch b/target/linux/generic/patches-2.6.38/020-ssb_update.patch index 0d86b7e589..a81b07e26f 100644 --- a/target/linux/generic/patches-2.6.38/020-ssb_update.patch +++ b/target/linux/generic/patches-2.6.38/020-ssb_update.patch @@ -88,7 +88,7 @@ } SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A, SSB_SPROM4_ANTAVAIL_A_SHIFT); -@@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus +@@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus break; default: ssb_printk(KERN_WARNING PFX "Unsupported SPROM" diff --git a/target/linux/generic/patches-2.6.38/110_fix_ecn_marking_ipv6.patch b/target/linux/generic/patches-2.6.38/110_fix_ecn_marking_ipv6.patch index 442e5e3c32..a981884b1b 100644 --- a/target/linux/generic/patches-2.6.38/110_fix_ecn_marking_ipv6.patch +++ b/target/linux/generic/patches-2.6.38/110_fix_ecn_marking_ipv6.patch @@ -1,6 +1,6 @@ --- a/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; } diff --git a/target/linux/generic/patches-2.6.38/230-openwrt_lzma_options.patch b/target/linux/generic/patches-2.6.38/230-openwrt_lzma_options.patch index 67e0ceefb0..8819a633ac 100644 --- a/target/linux/generic/patches-2.6.38/230-openwrt_lzma_options.patch +++ b/target/linux/generic/patches-2.6.38/230-openwrt_lzma_options.patch @@ -1,6 +1,6 @@ --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ diff --git a/target/linux/generic/patches-2.6.38/306-mips_mem_functions_performance.patch b/target/linux/generic/patches-2.6.38/306-mips_mem_functions_performance.patch index 6ea9ba51ee..e4324717b4 100644 --- a/target/linux/generic/patches-2.6.38/306-mips_mem_functions_performance.patch +++ b/target/linux/generic/patches-2.6.38/306-mips_mem_functions_performance.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/string.h +++ b/arch/mips/include/asm/string.h -@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ +@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ #define __HAVE_ARCH_MEMSET extern void *memset(void *__s, int __c, size_t __count); diff --git a/target/linux/generic/patches-2.6.38/311-arm_update_mach_types.patch b/target/linux/generic/patches-2.6.38/311-arm_update_mach_types.patch index 8f08864f21..543900348d 100644 --- a/target/linux/generic/patches-2.6.38/311-arm_update_mach_types.patch +++ b/target/linux/generic/patches-2.6.38/311-arm_update_mach_types.patch @@ -49,7 +49,7 @@ htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391 htc_opal MACH_HTC_OPAL HTC_OPAL 2392 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 -@@ -2446,7 +2441,6 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 +@@ -2446,7 +2441,6 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 sm3k MACH_SM3K SM3K 2460 acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461 diff --git a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch index 9d04b7ca4f..5158266d2b 100644 --- a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch @@ -193,7 +193,7 @@ /* * 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 -@@ -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; uint64_t cur_offset = 0; int i; @@ -203,7 +203,7 @@ 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); @@ -225,7 +225,7 @@ 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); @@ -260,7 +260,7 @@ --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, +@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, file->f_pos = 0; break; } diff --git a/target/linux/generic/patches-2.6.38/460-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.38/460-cfi_show_amd_extended_table_version.patch index 7111b2193c..2369a19fac 100644 --- a/target/linux/generic/patches-2.6.38/460-cfi_show_amd_extended_table_version.patch +++ b/target/linux/generic/patches-2.6.38/460-cfi_show_amd_extended_table_version.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct /* * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 diff --git a/target/linux/generic/patches-2.6.38/501-yaffs_cvs_2009_04_24.patch b/target/linux/generic/patches-2.6.38/501-yaffs_cvs_2009_04_24.patch index 5c70e79a05..c334b17d08 100644 --- a/target/linux/generic/patches-2.6.38/501-yaffs_cvs_2009_04_24.patch +++ b/target/linux/generic/patches-2.6.38/501-yaffs_cvs_2009_04_24.patch @@ -601,7 +601,7 @@ dev->checkpointBlockList[i] = -1; } -@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device +@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) { @@ -926,7 +926,7 @@ { unsigned char cDelta; /* column parity delta */ unsigned lDelta; /* line parity delta */ -@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char return 0; /* no error */ if (lDelta == ~lDeltaPrime && @@ -936,7 +936,7 @@ /* Single bit (recoverable) error in data */ bit = 0; -@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char if (cDelta & 0x02) bit |= 0x01; @@ -945,7 +945,7 @@ return -1; data[lDelta] ^= (1 << bit); -@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char } if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) + @@ -954,7 +954,7 @@ /* Reccoverable error in ecc */ *read_ecc = *test_ecc; -@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char /* Unrecoverable error */ return -1; @@ -1398,7 +1398,7 @@ { unsigned char *alias; int ret; -@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry +@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry return ret; } @@ -1560,7 +1560,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) #else static int yaffs_file_flush(struct file *file) -@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file +@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file yaffs_Device *dev = obj->myDev; T(YAFFS_TRACE_OS, @@ -1571,7 +1571,7 @@ yaffs_GrossLock(dev); -@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct +@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct yaffs_Device *dev; @@ -1591,7 +1591,7 @@ BUG_ON(!PageLocked(pg)); #else if (!PageLocked(pg)) -@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct +@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct yaffs_GrossLock(dev); @@ -1604,7 +1604,7 @@ yaffs_GrossUnlock(dev); -@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct +@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct flush_dcache_page(pg); kunmap(pg); @@ -3193,7 +3193,7 @@ if (n < step) { n++; continue; -@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file +@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file char *end; char *mask_name; const char *x; @@ -3202,7 +3202,7 @@ int i; int done = 0; int add, len = 0; -@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file +@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file while (!done && (pos < count)) { done = 1; @@ -3213,7 +3213,7 @@ switch (buf[pos]) { case '+': -@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file +@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file mask_name = NULL; mask_bitfield = simple_strtoul(buf + pos, &end, 0); @@ -3240,7 +3240,7 @@ mask_name = mask_flags[i].mask_name; mask_bitfield = mask_flags[i].mask_bitfield; done = 0; -@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file +@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file if (mask_name != NULL) { done = 0; @@ -3249,7 +3249,7 @@ case '-': rg &= ~mask_bitfield; break; -@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file +@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS; @@ -5691,7 +5691,7 @@ { /* Get the real object in case we were fed a hard link as an equivalent object */ equivalentObject = yaffs_GetEquivalentObject(equivalentObject); -@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * +@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * } @@ -7622,7 +7622,7 @@ int nToCopy; int n = nBytes; int nDone = 0; -@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object dev = in->myDev; while (n > 0) { @@ -7657,7 +7657,7 @@ if (dev->nShortOpCaches > 0) { /* If we can't find the data in the cache, then load it up. */ -@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object cache->locked = 1; @@ -7673,7 +7673,7 @@ cache->locked = 0; } else { /* Read into the local buffer then copy..*/ -@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object yaffs_GetTempBuffer(dev, __LINE__); yaffs_ReadChunkDataFromObject(in, chunk, localBuffer); @@ -7718,7 +7718,7 @@ } n -= nToCopy; -@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object return nDone; } @@ -7923,7 +7923,7 @@ int newFullChunks; yaffs_Device *dev = in->myDev; -@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, +@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, yaffs_CheckGarbageCollection(dev); @@ -7941,7 +7941,7 @@ if (newSize < oldFileSize) { -@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, +@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, } @@ -7968,7 +7968,7 @@ { obj = yaffs_GetEquivalentObject(obj); -@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * +@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * @@ -9789,7 +9789,7 @@ { int init_failed = 0; unsigned x; -@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * dev->chunkOffset = 0; dev->nFreeChunks = 0; @@ -9798,7 +9798,7 @@ if (dev->startBlock == 0) { dev->internalStartBlock = dev->startBlock + 1; dev->internalEndBlock = dev->endBlock + 1; -@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * /* Check geometry parameters. */ @@ -9823,7 +9823,7 @@ return YAFFS_FAIL; } -@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * return YAFFS_FAIL; } @@ -9836,7 +9836,7 @@ /* Got the right mix of functions? */ if (!yaffs_CheckDevFunctions(dev)) { /* Function missing */ -@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * dev->isMounted = 1; @@ -9875,7 +9875,7 @@ /* * Calculate chunkGroupBits. -@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * bits = ShiftsGE(x); /* Set up tnode width if wide tnodes are enabled. */ @@ -9896,7 +9896,7 @@ dev->tnodeWidth = 16; dev->tnodeMask = (1<<dev->tnodeWidth)-1; -@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */ /* Initialise temporary buffers and caches. */ @@ -9905,7 +9905,7 @@ init_failed = 1; dev->srCache = NULL; -@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * if (!init_failed && dev->nShortOpCaches > 0) { int i; @@ -9940,7 +9940,7 @@ init_failed = 1; dev->srLastUse = 0; -@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * dev->cacheHits = 0; @@ -9979,7 +9979,7 @@ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: restored from checkpoint" TENDSTR))); } else { -@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * dev->nBackgroundDeletions = 0; dev->oldestDirtySequence = 0; @@ -10011,7 +10011,7 @@ /* Clean up the mess */ T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR))); -@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * } @@ -10710,7 +10710,7 @@ { if (etags) { memset(etags, 0, sizeof(*etags)); -@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * +@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * * Returns YAFFS_OK or YAFFS_FAIL. */ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, @@ -11038,14 +11038,14 @@ + yaffs_UnpackTags2(tags, &pt); + } + } - -- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) -- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; ++ + if (localData) + 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) -+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; + tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; +- if (retval == 0) return YAFFS_OK; else diff --git a/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch b/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch index f26ecf5425..c9f1eadb10 100644 --- a/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch +++ b/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch @@ -316,7 +316,7 @@ chunk/page state. This byte is zeroed when the page is discarded. Choose this option if you have existing on-NAND data in this format that you need to continue to support. New data written also uses the -@@ -57,7 +78,7 @@ adjusted to use the older-style format. +@@ -57,7 +78,7 @@ adjusted to use the older-style format. MTD versions in yaffs_mtdif1.c. */ /* Default: Not selected */ @@ -1614,7 +1614,7 @@ yaffs_ECCOther *read_ecc, const yaffs_ECCOther *test_ecc) { -@@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char if (cDelta & 0x02) bit |= 0x01; @@ -1623,7 +1623,7 @@ return -1; data[lDelta] ^= (1 << bit); -@@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char return 1; /* corrected */ } diff --git a/target/linux/generic/patches-2.6.38/510-jffs2_make_lzma_available.patch b/target/linux/generic/patches-2.6.38/510-jffs2_make_lzma_available.patch index e594039bf6..f1ad92d7c0 100644 --- a/target/linux/generic/patches-2.6.38/510-jffs2_make_lzma_available.patch +++ b/target/linux/generic/patches-2.6.38/510-jffs2_make_lzma_available.patch @@ -1081,7 +1081,7 @@ ifdef CONFIG_FUNCTION_TRACER ORIG_CFLAGS := $(KBUILD_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_XZ_DEC) += xz/ obj-$(CONFIG_RAID6_PQ) += raid6/ diff --git a/target/linux/generic/patches-2.6.38/511-debloat_lzma.patch b/target/linux/generic/patches-2.6.38/511-debloat_lzma.patch index 18e4a51ee3..1e41661ebb 100644 --- a/target/linux/generic/patches-2.6.38/511-debloat_lzma.patch +++ b/target/linux/generic/patches-2.6.38/511-debloat_lzma.patch @@ -124,7 +124,7 @@ /* LzmaDecode --- a/lib/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c -@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, +@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, p->needFlush = 0; } @@ -194,7 +194,7 @@ { CLzmaProps propNew; RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, +@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, return SZ_OK; } @@ -375,7 +375,7 @@ void MatchFinder_Construct(CMatchFinder *p); /* Conditions: -@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, +@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc); void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); diff --git a/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch index b47f05c4c7..8a66cab18e 100644 --- a/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch +++ b/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch @@ -30,7 +30,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) +@@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o diff --git a/target/linux/generic/patches-2.6.38/722-phy_mvswitch.patch b/target/linux/generic/patches-2.6.38/722-phy_mvswitch.patch index 00950dc637..2025b229a4 100644 --- a/target/linux/generic/patches-2.6.38/722-phy_mvswitch.patch +++ b/target/linux/generic/patches-2.6.38/722-phy_mvswitch.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -103,6 +103,9 @@ config ADM6996_PHY - ---help--- - Currently supports the ADM6996F switch +@@ -105,6 +105,9 @@ config ADM6996_PHY + Currently supports the ADM6996FC and ADM6996M switches. + Support for FC is very limited. +config MVSWITCH_PHY + tristate "Driver for Marvell 88E6060 switches" diff --git a/target/linux/generic/patches-2.6.38/723-phy_ip175c.patch b/target/linux/generic/patches-2.6.38/723-phy_ip175c.patch index 0af080bc9b..9e13e579dd 100644 --- a/target/linux/generic/patches-2.6.38/723-phy_ip175c.patch +++ b/target/linux/generic/patches-2.6.38/723-phy_ip175c.patch @@ -1,6 +1,6 @@ --- a/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 tristate "Driver for Marvell 88E6060 switches" diff --git a/target/linux/generic/patches-2.6.38/724-phy_ar8216.patch b/target/linux/generic/patches-2.6.38/724-phy_ar8216.patch index e532b3cca9..a718e370f1 100644 --- a/target/linux/generic/patches-2.6.38/724-phy_ar8216.patch +++ b/target/linux/generic/patches-2.6.38/724-phy_ar8216.patch @@ -1,6 +1,6 @@ --- a/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" select SWCONFIG diff --git a/target/linux/generic/patches-2.6.38/725-phy_rtl8306.patch b/target/linux/generic/patches-2.6.38/725-phy_rtl8306.patch index 5a527b1863..a6d188f2ce 100644 --- a/target/linux/generic/patches-2.6.38/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-2.6.38/725-phy_rtl8306.patch @@ -1,6 +1,6 @@ --- a/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" select SWCONFIG diff --git a/target/linux/generic/patches-2.6.38/726-phy_rtl8366.patch b/target/linux/generic/patches-2.6.38/726-phy_rtl8366.patch index fdfeb54335..badc0a4e62 100644 --- a/target/linux/generic/patches-2.6.38/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-2.6.38/726-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/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. diff --git a/target/linux/generic/patches-2.6.38/750-hostap_txpower.patch b/target/linux/generic/patches-2.6.38/750-hostap_txpower.patch index e4c1803ff5..374a284454 100644 --- a/target/linux/generic/patches-2.6.38/750-hostap_txpower.patch +++ b/target/linux/generic/patches-2.6.38/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-2.6.38/830-ledtrig_morse.patch b/target/linux/generic/patches-2.6.38/830-ledtrig_morse.patch index 62a90a4591..8d90184556 100644 --- a/target/linux/generic/patches-2.6.38/830-ledtrig_morse.patch +++ b/target/linux/generic/patches-2.6.38/830-ledtrig_morse.patch @@ -11,7 +11,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += +@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/target/linux/generic/patches-2.6.38/831-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.38/831-ledtrig_netdev.patch index 5354aa187b..6406adac2a 100644 --- a/target/linux/generic/patches-2.6.38/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.38/831-ledtrig_netdev.patch @@ -14,7 +14,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o diff --git a/target/linux/generic/patches-2.6.38/834-gpio_ioctl.patch b/target/linux/generic/patches-2.6.38/834-gpio_ioctl.patch index 6609a1670a..3b7063223e 100644 --- a/target/linux/generic/patches-2.6.38/834-gpio_ioctl.patch +++ b/target/linux/generic/patches-2.6.38/834-gpio_ioctl.patch @@ -1,6 +1,6 @@ --- a/drivers/char/gpio_dev.c +++ b/drivers/char/gpio_dev.c -@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct +@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct } struct file_operations gpio_fops = { diff --git a/target/linux/generic/patches-2.6.38/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/patches-2.6.38/911-kobject_add_broadcast_uevent.patch index b3e4b6e7c7..7b36ab6115 100644 --- a/target/linux/generic/patches-2.6.38/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/patches-2.6.38/911-kobject_add_broadcast_uevent.patch @@ -20,7 +20,7 @@ #else static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action) -@@ -231,6 +237,16 @@ static inline int add_uevent_var(struct +@@ -231,6 +237,16 @@ static inline int add_uevent_var(struct static inline int kobject_action_type(const char *buf, size_t count, enum kobject_action *type) { return -EINVAL; } diff --git a/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch b/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch index a1c088a9a8..deab36bc31 100644 --- a/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch +++ b/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch @@ -24,7 +24,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk +@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk } #endif @@ -160,7 +160,7 @@ --- a/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); } diff --git a/target/linux/generic/patches-2.6.38/950-vm_exports.patch b/target/linux/generic/patches-2.6.38/950-vm_exports.patch index d23ce2ce13..15484dfc31 100644 --- a/target/linux/generic/patches-2.6.38/950-vm_exports.patch +++ b/target/linux/generic/patches-2.6.38/950-vm_exports.patch @@ -32,7 +32,7 @@ } --- a/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 */ return expand_fdtable(files, nr); } @@ -88,7 +88,7 @@ /** * 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; } @@ -116,7 +116,7 @@ void *caller) --- a/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); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 1433201019..1a82ea3e8d 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=2.6.38.2 +LINUX_VERSION:=2.6.38.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index d32a58ef23..a83103d6ac 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540 FEATURES:=spe_fpu ramdisk MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.38.2 +LINUX_VERSION:=2.6.38.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile index e5659d558e..2488ea505b 100644 --- a/target/linux/omap24xx/Makefile +++ b/target/linux/omap24xx/Makefile @@ -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 diff --git a/target/linux/omap24xx/patches-2.6.38/200-omap-platform.patch b/target/linux/omap24xx/patches-2.6.38/200-omap-platform.patch index 2c31b24a63..1a0a3def48 100644 --- a/target/linux/omap24xx/patches-2.6.38/200-omap-platform.patch +++ b/target/linux/omap24xx/patches-2.6.38/200-omap-platform.patch @@ -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ölä <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ölä <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; }; diff --git a/target/linux/omap24xx/patches-2.6.38/300-nokia-board.patch b/target/linux/omap24xx/patches-2.6.38/300-nokia-board.patch index 0a28c0d450..e292c21c86 100644 --- a/target/linux/omap24xx/patches-2.6.38/300-nokia-board.patch +++ b/target/linux/omap24xx/patches-2.6.38/300-nokia-board.patch @@ -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, diff --git a/target/linux/omap24xx/patches-2.6.38/301-nokia-board-additional.patch b/target/linux/omap24xx/patches-2.6.38/301-nokia-board-additional.patch index e3dc6cf3cb..6c2294fee9 100644 --- a/target/linux/omap24xx/patches-2.6.38/301-nokia-board-additional.patch +++ b/target/linux/omap24xx/patches-2.6.38/301-nokia-board-additional.patch @@ -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 = { diff --git a/target/linux/omap24xx/patches-2.6.38/310-n8x0-gpioswitch-input.patch b/target/linux/omap24xx/patches-2.6.38/310-n8x0-gpioswitch-input.patch index ea41babc6f..30a169f536 100644 --- a/target/linux/omap24xx/patches-2.6.38/310-n8x0-gpioswitch-input.patch +++ b/target/linux/omap24xx/patches-2.6.38/310-n8x0-gpioswitch-input.patch @@ -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, diff --git a/target/linux/omap24xx/patches-2.6.38/400-bluetooth-hci_h4p.patch b/target/linux/omap24xx/patches-2.6.38/400-bluetooth-hci_h4p.patch index 98ecc0e6af..408da4a3a0 100644 --- a/target/linux/omap24xx/patches-2.6.38/400-bluetooth-hci_h4p.patch +++ b/target/linux/omap24xx/patches-2.6.38/400-bluetooth-hci_h4p.patch @@ -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 diff --git a/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch b/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch index ce02f770a0..6741511a88 100644 --- a/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch +++ b/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch @@ -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; } diff --git a/target/linux/omap24xx/patches-2.6.38/420-hci-h4p-interrupt-workaround.patch b/target/linux/omap24xx/patches-2.6.38/420-hci-h4p-interrupt-workaround.patch index 91b23405b1..829de435cb 100644 --- a/target/linux/omap24xx/patches-2.6.38/420-hci-h4p-interrupt-workaround.patch +++ b/target/linux/omap24xx/patches-2.6.38/420-hci-h4p-interrupt-workaround.patch @@ -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; } diff --git a/target/linux/omap24xx/patches-2.6.38/500-cbus.patch b/target/linux/omap24xx/patches-2.6.38/500-cbus.patch index 6666bd9655..3810de77f7 100644 --- a/target/linux/omap24xx/patches-2.6.38/500-cbus.patch +++ b/target/linux/omap24xx/patches-2.6.38/500-cbus.patch @@ -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ölä"); +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ölä"); -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ölä, Tony Lindgren, and Timo Terä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" diff --git a/target/linux/omap24xx/patches-2.6.38/501-cbus-retu-irq-nr-fix.patch b/target/linux/omap24xx/patches-2.6.38/501-cbus-retu-irq-nr-fix.patch index abe3e0305d..478bcc83d7 100644 --- a/target/linux/omap24xx/patches-2.6.38/501-cbus-retu-irq-nr-fix.patch +++ b/target/linux/omap24xx/patches-2.6.38/501-cbus-retu-irq-nr-fix.patch @@ -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; } diff --git a/target/linux/omap24xx/patches-2.6.38/505-cbus-retu-write-lock.patch b/target/linux/omap24xx/patches-2.6.38/505-cbus-retu-write-lock.patch index 0fb8c6f212..1e18dc2198 100644 --- a/target/linux/omap24xx/patches-2.6.38/505-cbus-retu-write-lock.patch +++ b/target/linux/omap24xx/patches-2.6.38/505-cbus-retu-write-lock.patch @@ -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); diff --git a/target/linux/omap24xx/patches-2.6.38/506-cbus-retu-irq-handler-locking.patch b/target/linux/omap24xx/patches-2.6.38/506-cbus-retu-irq-handler-locking.patch index 364ffa386e..7729327a0d 100644 --- a/target/linux/omap24xx/patches-2.6.38/506-cbus-retu-irq-handler-locking.patch +++ b/target/linux/omap24xx/patches-2.6.38/506-cbus-retu-irq-handler-locking.patch @@ -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; diff --git a/target/linux/omap24xx/patches-2.6.38/510-cbus-retu-defines.patch b/target/linux/omap24xx/patches-2.6.38/510-cbus-retu-defines.patch index c4acce9eac..4bfe2bfea7 100644 --- a/target/linux/omap24xx/patches-2.6.38/510-cbus-retu-defines.patch +++ b/target/linux/omap24xx/patches-2.6.38/510-cbus-retu-defines.patch @@ -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 */ diff --git a/target/linux/omap24xx/patches-2.6.38/520-cbus-tahvo-defines.patch b/target/linux/omap24xx/patches-2.6.38/520-cbus-tahvo-defines.patch index ca109261fa..9d1837a771 100644 --- a/target/linux/omap24xx/patches-2.6.38/520-cbus-tahvo-defines.patch +++ b/target/linux/omap24xx/patches-2.6.38/520-cbus-tahvo-defines.patch @@ -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 */ diff --git a/target/linux/omap24xx/patches-2.6.38/530-cbus-retu-wdt-preemptible.patch b/target/linux/omap24xx/patches-2.6.38/530-cbus-retu-wdt-preemptible.patch index fecbd09a76..96c1f6c120 100644 --- a/target/linux/omap24xx/patches-2.6.38/530-cbus-retu-wdt-preemptible.patch +++ b/target/linux/omap24xx/patches-2.6.38/530-cbus-retu-wdt-preemptible.patch @@ -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; diff --git a/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch b/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch index 6de2c79f1a..c06cedeea1 100644 --- a/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch +++ b/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch @@ -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 { diff --git a/target/linux/omap24xx/patches-2.6.38/534-cbus-retu-wdt-remove-unused-interfaces.patch b/target/linux/omap24xx/patches-2.6.38/534-cbus-retu-wdt-remove-unused-interfaces.patch index b7f73839e1..7ce813093a 100644 --- a/target/linux/omap24xx/patches-2.6.38/534-cbus-retu-wdt-remove-unused-interfaces.patch +++ b/target/linux/omap24xx/patches-2.6.38/534-cbus-retu-wdt-remove-unused-interfaces.patch @@ -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 */ diff --git a/target/linux/omap24xx/patches-2.6.38/535-cbus-retu-wdt-cleanup.patch b/target/linux/omap24xx/patches-2.6.38/535-cbus-retu-wdt-cleanup.patch index 3ec78d1dd7..05bcc918a2 100644 --- a/target/linux/omap24xx/patches-2.6.38/535-cbus-retu-wdt-cleanup.patch +++ b/target/linux/omap24xx/patches-2.6.38/535-cbus-retu-wdt-cleanup.patch @@ -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; diff --git a/target/linux/omap24xx/patches-2.6.38/540-cbus-retu-wdt-remove-static-variables.patch b/target/linux/omap24xx/patches-2.6.38/540-cbus-retu-wdt-remove-static-variables.patch index 14d31112e7..482b6d77ac 100644 --- a/target/linux/omap24xx/patches-2.6.38/540-cbus-retu-wdt-remove-static-variables.patch +++ b/target/linux/omap24xx/patches-2.6.38/540-cbus-retu-wdt-remove-static-variables.patch @@ -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> diff --git a/target/linux/omap24xx/patches-2.6.38/545-cbus-retu-wdt-constify-info-struct.patch b/target/linux/omap24xx/patches-2.6.38/545-cbus-retu-wdt-constify-info-struct.patch index 8d6d2bb8cb..d07ad5f899 100644 --- a/target/linux/omap24xx/patches-2.6.38/545-cbus-retu-wdt-constify-info-struct.patch +++ b/target/linux/omap24xx/patches-2.6.38/545-cbus-retu-wdt-constify-info-struct.patch @@ -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; diff --git a/target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-ptr-fix.patch b/target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-ptr-fix.patch index 3453900b20..aa6200b7f1 100644 --- a/target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-ptr-fix.patch +++ b/target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-ptr-fix.patch @@ -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 diff --git a/target/linux/omap24xx/patches-2.6.38/595-cbus-tahvo-usb-leak.patch b/target/linux/omap24xx/patches-2.6.38/595-cbus-tahvo-usb-leak.patch index 001b912fbc..2fd4276acb 100644 --- a/target/linux/omap24xx/patches-2.6.38/595-cbus-tahvo-usb-leak.patch +++ b/target/linux/omap24xx/patches-2.6.38/595-cbus-tahvo-usb-leak.patch @@ -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) diff --git a/target/linux/omap24xx/patches-2.6.38/596-cbus-tahvo-usb-clk.patch b/target/linux/omap24xx/patches-2.6.38/596-cbus-tahvo-usb-clk.patch index 34279b4280..2c88dfc288 100644 --- a/target/linux/omap24xx/patches-2.6.38/596-cbus-tahvo-usb-clk.patch +++ b/target/linux/omap24xx/patches-2.6.38/596-cbus-tahvo-usb-clk.patch @@ -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; diff --git a/target/linux/omap24xx/patches-2.6.38/597-cbus-tahvo-usb-platform.patch b/target/linux/omap24xx/patches-2.6.38/597-cbus-tahvo-usb-platform.patch index 4c15cc3e8f..acc3ba34e0 100644 --- a/target/linux/omap24xx/patches-2.6.38/597-cbus-tahvo-usb-platform.patch +++ b/target/linux/omap24xx/patches-2.6.38/597-cbus-tahvo-usb-platform.patch @@ -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> diff --git a/target/linux/omap24xx/patches-2.6.38/600-tsc2005.patch b/target/linux/omap24xx/patches-2.6.38/600-tsc2005.patch index b491cfa7d6..4fed8030b3 100644 --- a/target/linux/omap24xx/patches-2.6.38/600-tsc2005.patch +++ b/target/linux/omap24xx/patches-2.6.38/600-tsc2005.patch @@ -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 diff --git a/target/linux/omap24xx/patches-2.6.38/710-evdev-events-without-grab.patch b/target/linux/omap24xx/patches-2.6.38/710-evdev-events-without-grab.patch index c483eab2a0..fa81278042 100644 --- a/target/linux/omap24xx/patches-2.6.38/710-evdev-events-without-grab.patch +++ b/target/linux/omap24xx/patches-2.6.38/710-evdev-events-without-grab.patch @@ -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); diff --git a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch index 6abcf9823b..854a1305e4 100644 --- a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch +++ b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch @@ -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; } diff --git a/target/linux/omap24xx/patches-2.6.38/811-mmc-null-ptr-fix.patch b/target/linux/omap24xx/patches-2.6.38/811-mmc-null-ptr-fix.patch index a8eaaf8dde..16b9ca6fe2 100644 --- a/target/linux/omap24xx/patches-2.6.38/811-mmc-null-ptr-fix.patch +++ b/target/linux/omap24xx/patches-2.6.38/811-mmc-null-ptr-fix.patch @@ -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; } diff --git a/target/linux/omap24xx/patches-2.6.38/820-backlight-fixes.patch b/target/linux/omap24xx/patches-2.6.38/820-backlight-fixes.patch index 040d08b9f2..20cb61d5cf 100644 --- a/target/linux/omap24xx/patches-2.6.38/820-backlight-fixes.patch +++ b/target/linux/omap24xx/patches-2.6.38/820-backlight-fixes.patch @@ -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_ } } diff --git a/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch b/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch index e503b0e595..cf2e9ac25c 100644 --- a/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch +++ b/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch @@ -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 diff --git a/target/linux/omap24xx/patches-2.6.38/850-musb-tusb-modular-fixes.patch b/target/linux/omap24xx/patches-2.6.38/850-musb-tusb-modular-fixes.patch index 8089ece3db..111a499227 100644 --- a/target/linux/omap24xx/patches-2.6.38/850-musb-tusb-modular-fixes.patch +++ b/target/linux/omap24xx/patches-2.6.38/850-musb-tusb-modular-fixes.patch @@ -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 /*-------------------------------------------------------------------------*/ diff --git a/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch b/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch index b6722cd10a..beef0b60b1 100644 --- a/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch +++ b/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch @@ -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ölä"); -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; diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index d2b7c7c5cb..d22b573448 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=2.6.38.2 +LINUX_VERSION:=2.6.38.6 include $(INCLUDE_DIR)/target.mk |