Changeset 26905
- Timestamp:
- 2011-05-15T19:23:02+02:00 (7 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 68 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/kernel-version.mk
r26442 r26905 24 24 LINUX_KERNEL_MD5SUM:=05970afdce8ec4323a10dcd42bc4fb0c 25 25 endif 26 ifeq ($(LINUX_VERSION),2.6.38. 2)27 LINUX_KERNEL_MD5SUM:= 5e9d0edae15053ea9acd932e6d162d0326 ifeq ($(LINUX_VERSION),2.6.38.6) 27 LINUX_KERNEL_MD5SUM:=e896a3bb3185b8a8af8e2f010f63c02e 28 28 endif 29 29 -
trunk/target/linux/at91/Makefile
r26332 r26905 15 15 SUBTARGETS:=netus tqma9263 16 16 17 LINUX_VERSION:=2.6.38. 217 LINUX_VERSION:=2.6.38.6 18 18 DEVICE_TYPE= 19 19 -
trunk/target/linux/at91/patches/100-at91_i2c.patch
r24975 r26905 1 1 --- a/drivers/i2c/busses/Kconfig 2 2 +++ b/drivers/i2c/busses/Kconfig 3 @@ -28 2,7 +282,7 @@ comment "I2C system bus drivers (mostly3 @@ -283,7 +283,7 @@ comment "I2C system bus drivers (mostly 4 4 5 5 config I2C_AT91 -
trunk/target/linux/at91/patches/200-experimenta_adc_driver.patch
r26246 r26905 1 Index: linux-2.6.38/drivers/misc/Kconfig 2 =================================================================== 3 --- linux-2.6.38.orig/drivers/misc/Kconfig 2011-03-15 02:20:32.000000000 +0100 4 +++ linux-2.6.38/drivers/misc/Kconfig 2011-03-20 22:54:33.114794033 +0100 5 @@ -104,6 +104,10 @@ 1 --- a/drivers/misc/Kconfig 2 +++ b/drivers/misc/Kconfig 3 @@ -104,6 +104,10 @@ config ATMEL_TCB_CLKSRC_BLOCK 6 4 TC can be used for other purposes, such as PWM generation and 7 5 interval timing. … … 14 12 tristate "Device driver for IBM RSA service processor" 15 13 depends on X86 && PCI && INPUT && EXPERIMENTAL 16 Index: linux-2.6.38/drivers/misc/Makefile 17 =================================================================== 18 --- linux-2.6.38.orig/drivers/misc/Makefile 2011-03-15 02:20:32.000000000 +0100 19 +++ linux-2.6.38/drivers/misc/Makefile 2011-03-20 22:55:18.000000000 +0100 20 @@ -9,6 +9,7 @@ 14 --- a/drivers/misc/Makefile 15 +++ b/drivers/misc/Makefile 16 @@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_ 21 17 obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o 22 18 obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o … … 26 22 obj-$(CONFIG_ICS932S401) += ics932s401.o 27 23 obj-$(CONFIG_LKDTM) += lkdtm.o 28 -
trunk/target/linux/at91/patches/600-usb_vbus_active_high.patch
r25162 r26905 1 1 --- a/arch/arm/mach-at91/at91cap9_devices.c 2 2 +++ b/arch/arm/mach-at91/at91cap9_devices.c 3 @@ -77,7 +77,7 @@ 3 @@ -77,7 +77,7 @@ void __init at91_add_device_usbh(struct 4 4 /* Enable VBus control for UHP ports */ 5 5 for (i = 0; i < data->ports; i++) { … … 12 12 --- a/arch/arm/mach-at91/at91sam9263_devices.c 13 13 +++ b/arch/arm/mach-at91/at91sam9263_devices.c 14 @@ -71,7 +71,7 @@ 14 @@ -71,7 +71,7 @@ void __init at91_add_device_usbh(struct 15 15 /* Enable VBus control for UHP ports */ 16 16 for (i = 0; i < data->ports; i++) { … … 23 23 --- a/arch/arm/mach-at91/at91sam9g45_devices.c 24 24 +++ b/arch/arm/mach-at91/at91sam9g45_devices.c 25 @@ -1 19,7 +119,7 @@25 @@ -121,7 +121,7 @@ void __init at91_add_device_usbh_ohci(st 26 26 /* Enable VBus control for UHP ports */ 27 27 for (i = 0; i < data->ports; i++) { … … 32 32 33 33 usbh_ohci_data = *data; 34 @@ -17 4,7 +174,7 @@34 @@ -176,7 +176,7 @@ void __init at91_add_device_usbh_ehci(st 35 35 /* Enable VBus control for UHP ports */ 36 36 for (i = 0; i < data->ports; i++) { … … 43 43 --- a/arch/arm/mach-at91/include/mach/board.h 44 44 +++ b/arch/arm/mach-at91/include/mach/board.h 45 @@ -9 3,8 +93,9 @@45 @@ -96,8 +96,9 @@ extern void __init at91_add_device_eth(s 46 46 47 47 /* USB Host */ … … 57 57 --- a/drivers/usb/host/ohci-at91.c 58 58 +++ b/drivers/usb/host/ohci-at91.c 59 @@ -277,14 +277,13 @@ 59 @@ -277,14 +277,13 @@ static int ohci_hcd_at91_drv_probe(struc 60 60 if (pdata) { 61 61 /* REVISIT make the driver support per-port power switching, … … 74 74 } 75 75 76 @@ -301,7 +300,7 @@ 76 @@ -301,7 +300,7 @@ static int ohci_hcd_at91_drv_remove(stru 77 77 for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) { 78 78 if (pdata->vbus_pin[i] <= 0) -
trunk/target/linux/at91/patches/700-tqma9263-support.patch
r25162 r26905 1 1 --- a/arch/arm/mach-at91/Kconfig 2 2 +++ b/arch/arm/mach-at91/Kconfig 3 @@ -31 7,6 +317,12 @@3 @@ -318,6 +318,12 @@ config MACH_NEOCORE926 4 4 help 5 5 Select this if you are using the Adeneo Neocore 926 board. … … 16 16 --- a/arch/arm/mach-at91/Makefile 17 17 +++ b/arch/arm/mach-at91/Makefile 18 @@ -5 5,6 +55,7 @@18 @@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar 19 19 obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o 20 20 obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o -
trunk/target/linux/ep93xx/Makefile
r26873 r26905 14 14 MAINTAINER:=Florian Fainelli <florian@openwrt.org> 15 15 16 LINUX_VERSION:=2.6.38. 216 LINUX_VERSION:=2.6.38.6 17 17 18 18 include $(INCLUDE_DIR)/target.mk -
trunk/target/linux/ep93xx/patches-2.6.38/001-ep93xx_cpuinfo.patch
r26873 r26905 30 30 #include "compat.h" 31 31 #endif 32 @@ -98 9,9 +995,16 @@ static int c_show(struct seq_file *m, vo32 @@ -986,9 +992,16 @@ static int c_show(struct seq_file *m, vo 33 33 seq_puts(m, "\n"); 34 34 -
trunk/target/linux/generic/config-2.6.38
r26872 r26905 2555 2555 # CONFIG_TCP_CONG_YEAH is not set 2556 2556 # CONFIG_TCP_MD5SIG is not set 2557 # CONFIG_TEST_KSTRTOX is not set 2557 2558 # CONFIG_TEST_LIST_SORT is not set 2558 2559 # CONFIG_TEST_POWER is not set -
trunk/target/linux/generic/patches-2.6.38/020-ssb_update.patch
r26690 r26905 89 89 SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A, 90 90 SSB_SPROM4_ANTAVAIL_A_SHIFT); 91 @@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus 91 @@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus 92 92 break; 93 93 default: -
trunk/target/linux/generic/patches-2.6.38/110_fix_ecn_marking_ipv6.patch
r26858 r26905 1 1 --- a/include/net/inet_ecn.h 2 2 +++ b/include/net/inet_ecn.h 3 @@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate( __u8 outer, __u8 inner)3 @@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate( 4 4 return outer; 5 5 } -
trunk/target/linux/generic/patches-2.6.38/230-openwrt_lzma_options.patch
r26690 r26905 1 1 --- a/scripts/Makefile.lib 2 2 +++ b/scripts/Makefile.lib 3 @@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 3 @@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 4 4 5 5 quiet_cmd_lzma = LZMA $@ -
trunk/target/linux/generic/patches-2.6.38/306-mips_mem_functions_performance.patch
r26690 r26905 1 1 --- a/arch/mips/include/asm/string.h 2 2 +++ b/arch/mips/include/asm/string.h 3 @@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 3 @@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 4 4 5 5 #define __HAVE_ARCH_MEMSET -
trunk/target/linux/generic/patches-2.6.38/311-arm_update_mach_types.patch
r26690 r26905 50 50 htc_opal MACH_HTC_OPAL HTC_OPAL 2392 51 51 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 52 @@ -2446,7 +2441,6 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 52 @@ -2446,7 +2441,6 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 53 53 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 54 54 sm3k MACH_SM3K SM3K 2460 -
trunk/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
r26705 r26905 194 194 * This function, given a master MTD object and a partition table, creates 195 195 * and registers slave MTD objects which are bound to the master according to 196 @@ -652,6 +80 1,9 @@ int add_mtd_partitions(struct mtd_info *196 @@ -652,6 +803,9 @@ int add_mtd_partitions(struct mtd_info * 197 197 struct mtd_part *slave; 198 198 uint64_t cur_offset = 0; … … 204 204 printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); 205 205 206 @@ -666,6 +8 18,21 @@ int add_mtd_partitions(struct mtd_info *206 @@ -666,6 +820,21 @@ int add_mtd_partitions(struct mtd_info * 207 207 208 208 add_mtd_device(&slave->mtd); … … 226 226 } 227 227 228 @@ -673,6 +84 0,32 @@ int add_mtd_partitions(struct mtd_info *228 @@ -673,6 +842,32 @@ int add_mtd_partitions(struct mtd_info * 229 229 } 230 230 EXPORT_SYMBOL(add_mtd_partitions); … … 261 261 --- a/drivers/mtd/mtdchar.c 262 262 +++ b/drivers/mtd/mtdchar.c 263 @@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 263 @@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 264 264 file->f_pos = 0; 265 265 break; -
trunk/target/linux/generic/patches-2.6.38/460-cfi_show_amd_extended_table_version.patch
r26690 r26905 1 1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c 2 2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c 3 @@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct 3 @@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct 4 4 5 5 /* -
trunk/target/linux/generic/patches-2.6.38/501-yaffs_cvs_2009_04_24.patch
r26690 r26905 602 602 } 603 603 604 @@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 604 @@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 605 605 606 606 static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) … … 927 927 unsigned char cDelta; /* column parity delta */ 928 928 unsigned lDelta; /* line parity delta */ 929 @@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 929 @@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 930 930 return 0; /* no error */ 931 931 … … 937 937 938 938 bit = 0; 939 @@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 939 @@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 940 940 if (cDelta & 0x02) 941 941 bit |= 0x01; … … 946 946 947 947 data[lDelta] ^= (1 << bit); 948 @@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 948 @@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 949 949 } 950 950 … … 955 955 956 956 *read_ecc = *test_ecc; 957 @@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 957 @@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 958 958 /* Unrecoverable error */ 959 959 … … 1399 1399 unsigned char *alias; 1400 1400 int ret; 1401 @@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 1401 @@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 1402 1402 return ret; 1403 1403 } … … 1561 1561 #else 1562 1562 static int yaffs_file_flush(struct file *file) 1563 @@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 1563 @@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 1564 1564 yaffs_Device *dev = obj->myDev; 1565 1565 … … 1572 1572 yaffs_GrossLock(dev); 1573 1573 1574 @@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 1574 @@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 1575 1575 1576 1576 yaffs_Device *dev; … … 1592 1592 #else 1593 1593 if (!PageLocked(pg)) 1594 @@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 1594 @@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 1595 1595 1596 1596 yaffs_GrossLock(dev); … … 1605 1605 yaffs_GrossUnlock(dev); 1606 1606 1607 @@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 1607 @@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 1608 1608 flush_dcache_page(pg); 1609 1609 kunmap(pg); … … 3194 3194 n++; 3195 3195 continue; 3196 @@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 3196 @@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 3197 3197 char *end; 3198 3198 char *mask_name; … … 3203 3203 int done = 0; 3204 3204 int add, len = 0; 3205 @@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 3205 @@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 3206 3206 3207 3207 while (!done && (pos < count)) { … … 3214 3214 switch (buf[pos]) { 3215 3215 case '+': 3216 @@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 3216 @@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 3217 3217 mask_name = NULL; 3218 3218 … … 3241 3241 mask_bitfield = mask_flags[i].mask_bitfield; 3242 3242 done = 0; 3243 @@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 3243 @@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 3244 3244 3245 3245 if (mask_name != NULL) { … … 3250 3250 rg &= ~mask_bitfield; 3251 3251 break; 3252 @@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 3252 @@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 3253 3253 3254 3254 yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS; … … 5692 5692 /* Get the real object in case we were fed a hard link as an equivalent object */ 5693 5693 equivalentObject = yaffs_GetEquivalentObject(equivalentObject); 5694 @@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 5694 @@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 5695 5695 5696 5696 } … … 7623 7623 int n = nBytes; 7624 7624 int nDone = 0; 7625 @@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 7625 @@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 7626 7626 dev = in->myDev; 7627 7627 … … 7658 7658 7659 7659 /* If we can't find the data in the cache, then load it up. */ 7660 @@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 7660 @@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 7661 7661 7662 7662 cache->locked = 1; … … 7674 7674 } else { 7675 7675 /* Read into the local buffer then copy..*/ 7676 @@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 7676 @@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 7677 7677 yaffs_GetTempBuffer(dev, __LINE__); 7678 7678 yaffs_ReadChunkDataFromObject(in, chunk, … … 7719 7719 7720 7720 n -= nToCopy; 7721 @@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 7721 @@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 7722 7722 return nDone; 7723 7723 } … … 7924 7924 7925 7925 yaffs_Device *dev = in->myDev; 7926 @@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 7926 @@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 7927 7927 7928 7928 yaffs_CheckGarbageCollection(dev); … … 7942 7942 if (newSize < oldFileSize) { 7943 7943 7944 @@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 7944 @@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 7945 7945 } 7946 7946 … … 7969 7969 obj = yaffs_GetEquivalentObject(obj); 7970 7970 7971 @@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 7971 @@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 7972 7972 7973 7973 … … 9790 9790 int init_failed = 0; 9791 9791 unsigned x; 9792 @@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 9792 @@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 9793 9793 dev->chunkOffset = 0; 9794 9794 dev->nFreeChunks = 0; … … 9799 9799 dev->internalStartBlock = dev->startBlock + 1; 9800 9800 dev->internalEndBlock = dev->endBlock + 1; 9801 @@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 9801 @@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 9802 9802 9803 9803 /* Check geometry parameters. */ … … 9824 9824 } 9825 9825 9826 @@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 9826 @@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 9827 9827 return YAFFS_FAIL; 9828 9828 } … … 9837 9837 if (!yaffs_CheckDevFunctions(dev)) { 9838 9838 /* Function missing */ 9839 @@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 9839 @@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 9840 9840 9841 9841 dev->isMounted = 1; … … 9876 9876 /* 9877 9877 * Calculate chunkGroupBits. 9878 @@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 9878 @@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 9879 9879 bits = ShiftsGE(x); 9880 9880 … … 9897 9897 9898 9898 dev->tnodeMask = (1<<dev->tnodeWidth)-1; 9899 @@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 9899 @@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 9900 9900 dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */ 9901 9901 … … 9906 9906 9907 9907 dev->srCache = NULL; 9908 @@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 9908 @@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 9909 9909 if (!init_failed && 9910 9910 dev->nShortOpCaches > 0) { … … 9941 9941 9942 9942 dev->srLastUse = 0; 9943 @@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 9943 @@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 9944 9944 9945 9945 dev->cacheHits = 0; … … 9980 9980 (TSTR("yaffs: restored from checkpoint" TENDSTR))); 9981 9981 } else { 9982 @@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 9982 @@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 9983 9983 dev->nBackgroundDeletions = 0; 9984 9984 dev->oldestDirtySequence = 0; … … 10012 10012 T(YAFFS_TRACE_TRACING, 10013 10013 (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR))); 10014 @@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 10014 @@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 10015 10015 10016 10016 } … … 10711 10711 if (etags) { 10712 10712 memset(etags, 0, sizeof(*etags)); 10713 @@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 10713 @@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 10714 10714 * Returns YAFFS_OK or YAFFS_FAIL. 10715 10715 */ … … 11039 11039 + } 11040 11040 + } 11041 11042 - if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) 11043 - tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; 11041 + 11044 11042 + if (localData) 11045 11043 + yaffs_ReleaseTempBuffer(dev, data, __LINE__); 11046 11044 11045 - if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) 11047 11046 + if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) 11048 + tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; 11047 tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; 11048 - 11049 11049 if (retval == 0) 11050 11050 return YAFFS_OK; -
trunk/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch
r26690 r26905 317 317 Choose this option if you have existing on-NAND data in this format 318 318 that you need to continue to support. New data written also uses the 319 @@ -57,7 +78,7 @@ adjusted to use the older-style format. 319 @@ -57,7 +78,7 @@ adjusted to use the older-style format. 320 320 MTD versions in yaffs_mtdif1.c. 321 321 */ … … 1615 1615 const yaffs_ECCOther *test_ecc) 1616 1616 { 1617 @@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char 1617 @@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char 1618 1618 if (cDelta & 0x02) 1619 1619 bit |= 0x01; … … 1624 1624 1625 1625 data[lDelta] ^= (1 << bit); 1626 @@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char 1626 @@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char 1627 1627 return 1; /* corrected */ 1628 1628 } -
trunk/target/linux/generic/patches-2.6.38/510-jffs2_make_lzma_available.patch
r26690 r26905 1082 1082 ORIG_CFLAGS := $(KBUILD_CFLAGS) 1083 1083 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) 1084 @@ -7 1,6 +81,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/1084 @@ -73,6 +83,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/ 1085 1085 obj-$(CONFIG_LZO_DECOMPRESS) += lzo/ 1086 1086 obj-$(CONFIG_XZ_DEC) += xz/ -
trunk/target/linux/generic/patches-2.6.38/511-debloat_lzma.patch
r26690 r26905 125 125 --- a/lib/lzma/LzmaDec.c 126 126 +++ b/lib/lzma/LzmaDec.c 127 @@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 127 @@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 128 128 p->needFlush = 0; 129 129 } … … 195 195 CLzmaProps propNew; 196 196 RINOK(LzmaProps_Decode(&propNew, props, propsSize)); 197 @@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, 197 @@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, 198 198 return SZ_OK; 199 199 } … … 376 376 377 377 /* Conditions: 378 @@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 378 @@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 379 379 UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, 380 380 ISzAlloc *alloc); -
trunk/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch
r26690 r26905 31 31 --- a/net/netfilter/Makefile 32 32 +++ b/net/netfilter/Makefile 33 @@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 33 @@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 34 34 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o 35 35 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o -
trunk/target/linux/generic/patches-2.6.38/722-phy_mvswitch.patch
r26690 r26905 1 1 --- a/drivers/net/phy/Kconfig 2 2 +++ b/drivers/net/phy/Kconfig 3 @@ -10 3,6 +103,9 @@ config ADM6996_PHY4 ---help---5 Currently supports the ADM6996F switch3 @@ -105,6 +105,9 @@ config ADM6996_PHY 4 Currently supports the ADM6996FC and ADM6996M switches. 5 Support for FC is very limited. 6 6 7 7 +config MVSWITCH_PHY -
trunk/target/linux/generic/patches-2.6.38/723-phy_ip175c.patch
r26690 r26905 1 1 --- a/drivers/net/phy/Kconfig 2 2 +++ b/drivers/net/phy/Kconfig 3 @@ -10 6,6 +106,10 @@ config ADM6996_PHY3 @@ -108,6 +108,10 @@ config ADM6996_PHY 4 4 config MVSWITCH_PHY 5 5 tristate "Driver for Marvell 88E6060 switches" -
trunk/target/linux/generic/patches-2.6.38/724-phy_ar8216.patch
r26690 r26905 1 1 --- a/drivers/net/phy/Kconfig 2 2 +++ b/drivers/net/phy/Kconfig 3 @@ -11 0,6 +110,10 @@ config IP17XX_PHY3 @@ -112,6 +112,10 @@ config IP17XX_PHY 4 4 tristate "Driver for IC+ IP17xx switches" 5 5 select SWCONFIG -
trunk/target/linux/generic/patches-2.6.38/725-phy_rtl8306.patch
r26690 r26905 1 1 --- a/drivers/net/phy/Kconfig 2 2 +++ b/drivers/net/phy/Kconfig 3 @@ -11 4,6 +114,10 @@ config AR8216_PHY3 @@ -116,6 +116,10 @@ config AR8216_PHY 4 4 tristate "Driver for Atheros AR8216 switches" 5 5 select SWCONFIG -
trunk/target/linux/generic/patches-2.6.38/726-phy_rtl8366.patch
r26690 r26905 1 1 --- a/drivers/net/phy/Kconfig 2 2 +++ b/drivers/net/phy/Kconfig 3 @@ -15 6,4 +156,29 @@ config MDIO_OCTEON3 @@ -158,4 +158,29 @@ config MDIO_OCTEON 4 4 5 5 If in doubt, say Y. -
trunk/target/linux/generic/patches-2.6.38/750-hostap_txpower.patch
r26690 r26905 1 1 --- a/drivers/net/wireless/hostap/hostap_ap.c 2 2 +++ b/drivers/net/wireless/hostap/hostap_ap.c 3 @@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t 3 @@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t 4 4 addr[count].sa_family = ARPHRD_ETHER; 5 5 memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); -
trunk/target/linux/generic/patches-2.6.38/830-ledtrig_morse.patch
r26690 r26905 12 12 --- a/drivers/leds/Makefile 13 13 +++ b/drivers/leds/Makefile 14 @@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 14 @@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 15 15 obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o 16 16 obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o -
trunk/target/linux/generic/patches-2.6.38/831-ledtrig_netdev.patch
r26690 r26905 15 15 --- a/drivers/leds/Makefile 16 16 +++ b/drivers/leds/Makefile 17 @@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += 17 @@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += 18 18 obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o 19 19 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o -
trunk/target/linux/generic/patches-2.6.38/834-gpio_ioctl.patch
r26690 r26905 1 1 --- a/drivers/char/gpio_dev.c 2 2 +++ b/drivers/char/gpio_dev.c 3 @@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct 3 @@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct 4 4 } 5 5 -
trunk/target/linux/generic/patches-2.6.38/911-kobject_add_broadcast_uevent.patch
r26690 r26905 21 21 static inline int kobject_uevent(struct kobject *kobj, 22 22 enum kobject_action action) 23 @@ -231,6 +237,16 @@ static inline int add_uevent_var(struct 23 @@ -231,6 +237,16 @@ static inline int add_uevent_var(struct 24 24 static inline int kobject_action_type(const char *buf, size_t count, 25 25 enum kobject_action *type) -
trunk/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch
r26690 r26905 25 25 * particular randomness source. They do this by keeping track of the 26 26 * first and second order deltas of the event timings. 27 @@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk 27 @@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk 28 28 } 29 29 #endif … … 161 161 --- a/kernel/pid.c 162 162 +++ b/kernel/pid.c 163 @@ -42 4,6 +424,7 @@ struct task_struct *find_task_by_vpid(pi163 @@ -427,6 +427,7 @@ struct task_struct *find_task_by_vpid(pi 164 164 { 165 165 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); -
trunk/target/linux/generic/patches-2.6.38/950-vm_exports.patch
r26690 r26905 33 33 --- a/fs/file.c 34 34 +++ b/fs/file.c 35 @@ -26 4,6 +264,7 @@ int expand_files(struct files_struct *fi35 @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi 36 36 /* All good, so we try */ 37 37 return expand_fdtable(files, nr); … … 89 89 /** 90 90 * zap_vma_ptes - remove ptes mapping the vma 91 @@ -2 692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode91 @@ -2701,6 +2702,7 @@ int vmtruncate_range(struct inode *inode 92 92 93 93 return 0; … … 117 117 --- a/include/linux/mm.h 118 118 +++ b/include/linux/mm.h 119 @@ -86 3,6 +863,7 @@ extern void show_free_areas(void);119 @@ -864,6 +864,7 @@ extern void show_free_areas(void); 120 120 121 121 int shmem_lock(struct file *file, int lock, struct user_struct *user); -
trunk/target/linux/malta/Makefile
r26836 r26905 14 14 MAINTAINER:=Florian Fainelli <florian@openwrt.org> 15 15 16 LINUX_VERSION:=2.6.38. 216 LINUX_VERSION:=2.6.38.6 17 17 18 18 include $(INCLUDE_DIR)/target.mk -
trunk/target/linux/mpc85xx/Makefile
r26332 r26905 14 14 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 15 15 16 LINUX_VERSION:=2.6.38. 216 LINUX_VERSION:=2.6.38.6 17 17 18 18 include $(INCLUDE_DIR)/target.mk -
trunk/target/linux/omap24xx/Makefile
r26332 r26905 13 13 FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio 14 14 15 LINUX_VERSION:=2.6.38. 215 LINUX_VERSION:=2.6.38.6 16 16 17 17 define Target/Description -
trunk/target/linux/omap24xx/patches-2.6.38/200-omap-platform.patch
r25746 r26905 1 Index: linux-2.6.38-rc6/arch/arm/plat-omap/bootreason.c 2 =================================================================== 3 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 4 +++ linux-2.6.38-rc6/arch/arm/plat-omap/bootreason.c 2011-02-25 01:11:27.298563256 +0100 1 --- /dev/null 2 +++ b/arch/arm/plat-omap/bootreason.c 5 3 @@ -0,0 +1,79 @@ 6 4 +/* … … 83 81 + 84 82 +late_initcall(bootreason_init); 85 Index: linux-2.6.38-rc6/arch/arm/plat-omap/common.c 86 =================================================================== 87 --- linux-2.6.38-rc6.orig/arch/arm/plat-omap/common.c 2011-02-25 01:10:25.645115298 +0100 88 +++ linux-2.6.38-rc6/arch/arm/plat-omap/common.c 2011-02-25 01:11:27.298563256 +0100 83 --- a/arch/arm/plat-omap/common.c 84 +++ b/arch/arm/plat-omap/common.c 89 85 @@ -21,17 +21,89 @@ 90 86 #include <plat/vram.h> … … 177 173 * in the kernel. */ 178 174 for (i = 0; i < omap_board_config_size; i++) { 179 Index: linux-2.6.38-rc6/arch/arm/plat-omap/component-version.c 180 =================================================================== 181 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 182 +++ linux-2.6.38-rc6/arch/arm/plat-omap/component-version.c 2011-02-25 01:11:27.299563117 +0100 175 --- /dev/null 176 +++ b/arch/arm/plat-omap/component-version.c 183 177 @@ -0,0 +1,64 @@ 184 178 +/* … … 246 240 +MODULE_DESCRIPTION("Component version driver"); 247 241 +MODULE_LICENSE("GPL"); 248 Index: linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig 249 =================================================================== 250 --- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Kconfig 2011-02-25 01:10:25.621118611 +0100 251 +++ linux-2.6.38-rc6/arch/arm/plat-omap/Kconfig 2011-02-25 01:11:27.299563117 +0100 252 @@ -79,6 +79,38 @@ 242 --- a/arch/arm/plat-omap/Kconfig 243 +++ b/arch/arm/plat-omap/Kconfig 244 @@ -79,6 +79,38 @@ config OMAP_RESET_CLOCKS 253 245 probably do not want this option enabled until your 254 246 device drivers work properly. … … 289 281 bool "OMAP multiplexing support" 290 282 depends on ARCH_OMAP 291 Index: linux-2.6.38-rc6/arch/arm/plat-omap/Makefile 292 =================================================================== 293 --- linux-2.6.38-rc6.orig/arch/arm/plat-omap/Makefile 2011-02-25 01:10:25.604120958 +0100 294 +++ linux-2.6.38-rc6/arch/arm/plat-omap/Makefile 2011-02-25 01:11:27.299563117 +0100 295 @@ -23,6 +23,9 @@ 283 --- a/arch/arm/plat-omap/Makefile 284 +++ b/arch/arm/plat-omap/Makefile 285 @@ -23,6 +23,9 @@ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu- 296 286 297 287 obj-$(CONFIG_CPU_FREQ) += cpu-omap.o … … 303 293 obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o 304 294 i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o 305 Index: linux-2.6.38-rc6/arch/arm/include/asm/setup.h 306 =================================================================== 307 --- linux-2.6.38-rc6.orig/arch/arm/include/asm/setup.h 2011-02-25 01:10:25.523132140 +0100 308 +++ linux-2.6.38-rc6/arch/arm/include/asm/setup.h 2011-02-25 01:11:27.300562978 +0100 309 @@ -136,6 +136,13 @@ 295 --- a/arch/arm/include/asm/setup.h 296 +++ b/arch/arm/include/asm/setup.h 297 @@ -136,6 +136,13 @@ struct tag_acorn { 310 298 __u8 adfsdrives; 311 299 }; … … 321 309 #define ATAG_MEMCLK 0x41000402 322 310 323 @@ -162,6 +169,11 @@ 311 @@ -162,6 +169,11 @@ struct tag { 324 312 struct tag_acorn acorn; 325 313 … … 333 321 */ 334 322 struct tag_memclk memclk; 335 Index: linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c 336 =================================================================== 337 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 338 +++ linux-2.6.38-rc6/arch/arm/plat-omap/gpio-switch.c 2011-02-25 01:11:27.301562839 +0100 323 --- /dev/null 324 +++ b/arch/arm/plat-omap/gpio-switch.c 339 325 @@ -0,0 +1,554 @@ 340 326 +/* … … 892 878 +MODULE_DESCRIPTION("GPIO switch driver"); 893 879 +MODULE_LICENSE("GPL"); 894 Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/board.h 895 =================================================================== 896 --- linux-2.6.38-rc6.orig/arch/arm/plat-omap/include/plat/board.h 2011-02-25 01:10:25.553127998 +0100 897 +++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/board.h 2011-02-25 01:11:27.301562839 +0100 898 @@ -151,6 +151,14 @@ 880 --- a/arch/arm/plat-omap/include/plat/board.h 881 +++ b/arch/arm/plat-omap/include/plat/board.h 882 @@ -151,6 +151,14 @@ struct omap_board_config_kernel { 899 883 const void *data; 900 884 }; -
trunk/target/linux/omap24xx/patches-2.6.38/300-nokia-board.patch
r25746 r26905 1 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:09:31.427080051 +0100 4 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:09:59.754956253 +0100 1 --- a/arch/arm/mach-omap2/board-n8x0.c 2 +++ b/arch/arm/mach-omap2/board-n8x0.c 5 3 @@ -15,8 +15,10 @@ 6 4 #include <linux/delay.h> … … 22 20 #include "mux.h" 23 21 24 @@ -194,6 +197,114 @@ 22 @@ -194,6 +197,114 @@ static struct omap_onenand_platform_data 25 23 }; 26 24 #endif … … 137 135 (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)) 138 136 139 @@ -628,11 +739,10 @@ 137 @@ -628,11 +739,10 @@ static void __init n8x0_map_io(void) 140 138 omap242x_map_common_io(); 141 139 } … … 150 148 151 149 #ifdef CONFIG_OMAP_MUX 152 @@ -686,6 +796,8 @@ 150 @@ -686,6 +796,8 @@ static inline void board_serial_init(voi 153 151 static void __init n8x0_init_machine(void) 154 152 { … … 159 157 spi_register_board_info(n800_spi_board_info, 160 158 ARRAY_SIZE(n800_spi_board_info)); 161 @@ -703,27 +815,30 @@ 159 @@ -703,27 +815,30 @@ static void __init n8x0_init_machine(voi 162 160 163 161 MACHINE_START(NOKIA_N800, "Nokia N800") -
trunk/target/linux/omap24xx/patches-2.6.38/301-nokia-board-additional.patch
r25797 r26905 1 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-28 16:48:12.972504055 +0100 4 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-28 21:03:41.761254167 +0100 1 --- a/arch/arm/mach-omap2/board-n8x0.c 2 +++ b/arch/arm/mach-omap2/board-n8x0.c 5 3 @@ -23,6 +23,9 @@ 6 4 #include <linux/spi/spi.h> … … 307 305 n8x0_mmc_init(); 308 306 n8x0_usb_init(); 309 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 310 =================================================================== 311 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 312 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-28 21:08:50.105894872 +0100 307 --- /dev/null 308 +++ b/arch/arm/mach-omap2/board-n8x0-lcd.c 313 309 @@ -0,0 +1,141 @@ 314 310 +/* … … 453 449 + printk(KERN_INFO "N8x0 Blizzard initialized"); 454 450 +} 455 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile 456 =================================================================== 457 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/Makefile 2011-02-28 16:45:53.321456871 +0100 458 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/Makefile 2011-02-28 16:48:12.997503690 +0100 451 --- a/arch/arm/mach-omap2/Makefile 452 +++ b/arch/arm/mach-omap2/Makefile 459 453 @@ -177,6 +177,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar 460 454 hsmmc.o \ … … 465 459 sdram-nokia.o \ 466 460 hsmmc.o 467 Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h 468 =================================================================== 469 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 470 +++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/cbus.h 2011-02-28 16:48:12.997503690 +0100 461 --- /dev/null 462 +++ b/arch/arm/plat-omap/include/plat/cbus.h 471 463 @@ -0,0 +1,40 @@ 472 464 +/* … … 510 502 + 511 503 +#endif /* __PLAT_CBUS_H */ 512 Index: linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h 513 =================================================================== 514 --- linux-2.6.38-rc6.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-02-28 16:45:53.350456485 +0100 515 +++ linux-2.6.38-rc6/arch/arm/plat-omap/include/plat/irqs.h 2011-02-28 16:48:12.998503676 +0100 504 --- a/arch/arm/plat-omap/include/plat/irqs.h 505 +++ b/arch/arm/plat-omap/include/plat/irqs.h 516 506 @@ -411,7 +411,20 @@ 517 507 #define TWL_IRQ_END TWL6030_IRQ_END … … 536 526 #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) 537 527 538 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/omap_hwmod_2420_data.c 539 =================================================================== 540 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-02-28 21:09:41.170169165 +0100 541 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-02-28 21:10:33.434425329 +0100 528 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c 529 +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c 542 530 @@ -673,6 +673,7 @@ static struct omap_hwmod_ocp_if *omap242 543 531 -
trunk/target/linux/omap24xx/patches-2.6.38/310-n8x0-gpioswitch-input.patch
r25746 r26905 3 3 1 file changed, 73 insertions(+) 4 4 5 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 6 =================================================================== 7 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:53:05.134457636 +0100 8 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0.c 2011-02-24 12:55:54.570320630 +0100 9 @@ -225,6 +225,77 @@ 5 --- a/arch/arm/mach-omap2/board-n8x0.c 6 +++ b/arch/arm/mach-omap2/board-n8x0.c 7 @@ -225,6 +225,77 @@ extern struct mipid_platform_data n8x0_m 10 8 extern void n8x0_mipid_init(void); 11 9 extern void n8x0_blizzard_init(void); … … 85 83 { 86 84 .name = "headphone", 87 @@ -246,11 +317,13 @@ 85 @@ -246,11 +317,13 @@ static struct omap_gpio_switch n8x0_gpio 88 86 .gpio = -1, 89 87 .debounce_rising = 200, -
trunk/target/linux/omap24xx/patches-2.6.38/400-bluetooth-hci_h4p.patch
r25746 r26905 12 12 10 files changed, 1891 insertions(+) 13 13 14 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c 15 =================================================================== 16 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 17 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/core.c 2010-11-05 17:04:44.762000001 +0100 14 --- /dev/null 15 +++ b/drivers/bluetooth/hci_h4p/core.c 18 16 @@ -0,0 +1,1043 @@ 19 17 +/* … … 1060 1058 +MODULE_LICENSE("GPL"); 1061 1059 +MODULE_AUTHOR("Ville Tervo"); 1062 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c 1063 =================================================================== 1064 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1065 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw.c 2010-11-05 17:04:44.762000001 +0100 1060 --- /dev/null 1061 +++ b/drivers/bluetooth/hci_h4p/fw.c 1066 1062 @@ -0,0 +1,155 @@ 1067 1063 +/* … … 1220 1216 + return; 1221 1217 +} 1222 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c 1223 =================================================================== 1224 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1225 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-csr.c 2010-11-05 17:04:44.762000001 +0100 1218 --- /dev/null 1219 +++ b/drivers/bluetooth/hci_h4p/fw-csr.c 1226 1220 @@ -0,0 +1,149 @@ 1227 1221 +/* … … 1374 1368 + return 0; 1375 1369 +} 1376 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c 1377 =================================================================== 1378 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1379 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/fw-ti.c 2010-11-05 17:04:44.762000001 +0100 1370 --- /dev/null 1371 +++ b/drivers/bluetooth/hci_h4p/fw-ti.c 1380 1372 @@ -0,0 +1,90 @@ 1381 1373 +/* … … 1469 1461 + return 0; 1470 1462 +} 1471 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/hci_h4p.h 1472 =================================================================== 1473 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1474 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/hci_h4p.h 2010-11-05 17:04:44.762000001 +0100 1463 --- /dev/null 1464 +++ b/drivers/bluetooth/hci_h4p/hci_h4p.h 1475 1465 @@ -0,0 +1,183 @@ 1476 1466 +/* … … 1657 1647 + 1658 1648 +#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */ 1659 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/Makefile 1660 =================================================================== 1661 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1662 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/Makefile 2010-11-05 17:04:44.762000001 +0100 1649 --- /dev/null 1650 +++ b/drivers/bluetooth/hci_h4p/Makefile 1663 1651 @@ -0,0 +1,7 @@ 1664 1652 +# … … 1669 1657 + 1670 1658 +hci_h4p-objs := core.o fw.o uart.o sysfs.o fw-ti.o fw-csr.o 1671 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/sysfs.c 1672 =================================================================== 1673 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1674 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/sysfs.c 2010-11-05 17:04:44.762000001 +0100 1659 --- /dev/null 1660 +++ b/drivers/bluetooth/hci_h4p/sysfs.c 1675 1661 @@ -0,0 +1,84 @@ 1676 1662 +/* … … 1758 1744 + 1759 1745 +#endif 1760 Index: linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c 1761 =================================================================== 1762 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1763 +++ linux-2.6.37-rc1/drivers/bluetooth/hci_h4p/uart.c 2010-11-05 17:04:44.762000001 +0100 1746 --- /dev/null 1747 +++ b/drivers/bluetooth/hci_h4p/uart.c 1764 1748 @@ -0,0 +1,169 @@ 1765 1749 +/* … … 1932 1916 + return 0; 1933 1917 +} 1934 Index: linux-2.6.37-rc1/drivers/bluetooth/Kconfig 1935 =================================================================== 1936 --- linux-2.6.37-rc1.orig/drivers/bluetooth/Kconfig 2010-11-01 12:54:12.000000000 +0100 1937 +++ linux-2.6.37-rc1/drivers/bluetooth/Kconfig 2010-11-05 17:04:44.762000001 +0100 1938 @@ -173,6 +173,16 @@ 1918 --- a/drivers/bluetooth/Kconfig 1919 +++ b/drivers/bluetooth/Kconfig 1920 @@ -173,6 +173,16 @@ config BT_HCIBTUART 1939 1921 Say Y here to compile support for HCI UART devices into the 1940 1922 kernel or say M to compile it as module (btuart_cs). … … 1953 1935 tristate "HCI VHCI (Virtual HCI device) driver" 1954 1936 help 1955 Index: linux-2.6.37-rc1/drivers/bluetooth/Makefile 1956 =================================================================== 1957 --- linux-2.6.37-rc1.orig/drivers/bluetooth/Makefile 2010-11-01 12:54:12.000000000 +0100 1958 +++ linux-2.6.37-rc1/drivers/bluetooth/Makefile 2010-11-05 17:04:44.763000001 +0100 1959 @@ -11,6 +11,7 @@ 1937 --- a/drivers/bluetooth/Makefile 1938 +++ b/drivers/bluetooth/Makefile 1939 @@ -11,6 +11,7 @@ obj-$(CONFIG_BT_HCIDTL1) += dtl1_cs.o 1960 1940 obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o 1961 1941 obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o -
trunk/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch
r25937 r26905 1 Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:32:55.783737501 +0100 4 +++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:33:09.851047680 +0100 1 --- a/drivers/bluetooth/hci_h4p/core.c 2 +++ b/drivers/bluetooth/hci_h4p/core.c 5 3 @@ -36,9 +36,9 @@ 6 4 #include <linux/clk.h> … … 16 14 17 15 #include <net/bluetooth/bluetooth.h> 18 Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h 19 =================================================================== 20 --- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:32:55.766739543 +0100 21 +++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:33:09.852047560 +0100 16 --- a/drivers/bluetooth/hci_h4p/hci_h4p.h 17 +++ b/drivers/bluetooth/hci_h4p/hci_h4p.h 22 18 @@ -21,7 +21,7 @@ 23 19 * … … 29 25 #include <net/bluetooth/bluetooth.h> 30 26 #include <net/bluetooth/hci_core.h> 31 Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c 32 =================================================================== 33 --- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:32:55.807734619 +0100 34 +++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:33:09.852047560 +0100 27 --- a/drivers/bluetooth/hci_h4p/sysfs.c 28 +++ b/drivers/bluetooth/hci_h4p/sysfs.c 35 29 @@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru 36 30 return -EINVAL; -
trunk/target/linux/omap24xx/patches-2.6.38/420-hci-h4p-interrupt-workaround.patch
r25939 r26905 1 Index: linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-03-07 16:07:00.174343135 +0100 4 +++ linux-2.6.38-rc7/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-03-07 16:09:15.601997493 +0100 1 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2 +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c 5 3 @@ -362,7 +362,7 @@ static struct omap_hwmod_class uart_clas 6 4 /* UART1 */ … … 12 10 13 11 static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { 14 Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 15 =================================================================== 16 --- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/serial.c 2011-03-07 16:06:21.934958270 +0100 17 +++ linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 2011-03-07 16:08:59.649922915 +0100 12 --- a/arch/arm/mach-omap2/serial.c 13 +++ b/arch/arm/mach-omap2/serial.c 18 14 @@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o 19 15 uart->padconf = 0; -
trunk/target/linux/omap24xx/patches-2.6.38/500-cbus.patch
r25746 r26905 20 20 18 files changed, 4533 insertions(+), 1 deletion(-) 21 21 22 Index: linux-2.6.38-rc6/drivers/cbus/cbus.c 23 =================================================================== 24 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 25 +++ linux-2.6.38-rc6/drivers/cbus/cbus.c 2011-02-24 12:04:51.456189134 +0100 22 --- /dev/null 23 +++ b/drivers/cbus/cbus.c 26 24 @@ -0,0 +1,332 @@ 27 25 +/* … … 357 355 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); 358 356 + 359 Index: linux-2.6.38-rc6/drivers/cbus/cbus.h 360 =================================================================== 361 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 362 +++ linux-2.6.38-rc6/drivers/cbus/cbus.h 2011-02-24 12:04:51.456189134 +0100 357 --- /dev/null 358 +++ b/drivers/cbus/cbus.h 363 359 @@ -0,0 +1,29 @@ 364 360 +/* … … 391 387 + 392 388 +#endif /* __DRIVERS_CBUS_CBUS_H */ 393 Index: linux-2.6.38-rc6/drivers/cbus/Kconfig 394 =================================================================== 395 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 396 +++ linux-2.6.38-rc6/drivers/cbus/Kconfig 2011-02-24 12:04:51.457189107 +0100 389 --- /dev/null 390 +++ b/drivers/cbus/Kconfig 397 391 @@ -0,0 +1,75 @@ 398 392 +# … … 471 465 + 472 466 +endmenu 473 Index: linux-2.6.38-rc6/drivers/cbus/Makefile 474 =================================================================== 475 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 476 +++ linux-2.6.38-rc6/drivers/cbus/Makefile 2011-02-24 12:04:51.458189081 +0100 467 --- /dev/null 468 +++ b/drivers/cbus/Makefile 477 469 @@ -0,0 +1,13 @@ 478 470 +# … … 489 481 +obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o 490 482 +obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o 491 Index: linux-2.6.38-rc6/drivers/cbus/retu.c 492 =================================================================== 493 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 494 +++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-24 12:04:51.458189081 +0100 483 --- /dev/null 484 +++ b/drivers/cbus/retu.c 495 485 @@ -0,0 +1,544 @@ 496 486 +/** … … 1038 1028 +MODULE_AUTHOR("David Weinehall"); 1039 1029 +MODULE_AUTHOR("Mikko Ylinen"); 1040 Index: linux-2.6.38-rc6/drivers/cbus/retu.h 1041 =================================================================== 1042 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1043 +++ linux-2.6.38-rc6/drivers/cbus/retu.h 2011-02-24 12:04:51.459189067 +0100 1030 --- /dev/null 1031 +++ b/drivers/cbus/retu.h 1044 1032 @@ -0,0 +1,66 @@ 1045 1033 +/** … … 1109 1097 + 1110 1098 +#endif /* __DRIVERS_CBUS_RETU_H */ 1111 Index: linux-2.6.38-rc6/drivers/cbus/retu-headset.c 1112 =================================================================== 1113 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1114 +++ linux-2.6.38-rc6/drivers/cbus/retu-headset.c 2011-02-24 12:04:51.460189032 +0100 1099 --- /dev/null 1100 +++ b/drivers/cbus/retu-headset.c 1115 1101 @@ -0,0 +1,359 @@ 1116 1102 +/** … … 1473 1459 +MODULE_LICENSE("GPL"); 1474 1460 +MODULE_AUTHOR("Juha Yrjölä"); 1475 Index: linux-2.6.38-rc6/drivers/cbus/retu-pwrbutton.c 1476 =================================================================== 1477 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1478 +++ linux-2.6.38-rc6/drivers/cbus/retu-pwrbutton.c 2011-02-24 12:04:51.460189032 +0100 1461 --- /dev/null 1462 +++ b/drivers/cbus/retu-pwrbutton.c 1479 1463 @@ -0,0 +1,165 @@ 1480 1464 +/** … … 1643 1627 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); 1644 1628 + 1645 Index: linux-2.6.38-rc6/drivers/cbus/retu-rtc.c 1646 =================================================================== 1647 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1648 +++ linux-2.6.38-rc6/drivers/cbus/retu-rtc.c 2011-02-24 12:04:51.461188993 +0100 1629 --- /dev/null 1630 +++ b/drivers/cbus/retu-rtc.c 1649 1631 @@ -0,0 +1,287 @@ 1650 1632 +/** … … 1935 1917 +MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); 1936 1918 + 1937 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 1938 =================================================================== 1939 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1940 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-02-24 12:04:51.461188993 +0100 1919 --- /dev/null 1920 +++ b/drivers/cbus/retu-wdt.c 1941 1921 @@ -0,0 +1,358 @@ 1942 1922 +/** … … 2298 2278 +MODULE_LICENSE("GPL"); 2299 2279 + 2300 Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c 2301 =================================================================== 2302 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 2303 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.c 2011-02-24 12:04:51.463188907 +0100 2280 --- /dev/null 2281 +++ b/drivers/cbus/tahvo.c 2304 2282 @@ -0,0 +1,391 @@ 2305 2283 +/** … … 2694 2672 +MODULE_AUTHOR("Mikko Ylinen"); 2695 2673 + 2696 Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h 2697 =================================================================== 2698 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 2699 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.h 2011-02-24 12:04:51.463188907 +0100 2674 --- /dev/null 2675 +++ b/drivers/cbus/tahvo.h 2700 2676 @@ -0,0 +1,57 @@ 2701 2677 +/* … … 2756 2732 + 2757 2733 +#endif /* __DRIVERS_CBUS_TAHVO_H */ 2758 Index: linux-2.6.38-rc6/drivers/cbus/tahvo-usb.c 2759 =================================================================== 2760 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 2761 +++ linux-2.6.38-rc6/drivers/cbus/tahvo-usb.c 2011-02-24 12:04:51.464188862 +0100 2734 --- /dev/null 2735 +++ b/drivers/cbus/tahvo-usb.c 2762 2736 @@ -0,0 +1,773 @@ 2763 2737 +/** … … 3534 3508 +MODULE_LICENSE("GPL"); 3535 3509 +MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs"); 3536 Index: linux-2.6.38-rc6/drivers/Makefile 3537 =================================================================== 3538 --- linux-2.6.38-rc6.orig/drivers/Makefile 2011-02-24 12:03:07.439316519 +0100 3539 +++ linux-2.6.38-rc6/drivers/Makefile 2011-02-24 12:03:27.457522207 +0100 3540 @@ -74,7 +74,7 @@ 3510 --- a/drivers/Makefile 3511 +++ b/drivers/Makefile 3512 @@ -74,7 +74,7 @@ obj-$(CONFIG_GAMEPORT) += input/gamepor 3541 3513 obj-$(CONFIG_INPUT) += input/ 3542 3514 obj-$(CONFIG_I2O) += message/ … … 3547 3519 obj-$(CONFIG_W1) += w1/ 3548 3520 obj-$(CONFIG_POWER_SUPPLY) += power/ 3549 Index: linux-2.6.38-rc6/arch/arm/Kconfig 3550 =================================================================== 3551 --- linux-2.6.38-rc6.orig/arch/arm/Kconfig 2011-02-24 12:03:07.286322589 +0100 3552 +++ linux-2.6.38-rc6/arch/arm/Kconfig 2011-02-24 12:03:27.458522167 +0100 3553 @@ -1930,6 +1930,10 @@ 3521 --- a/arch/arm/Kconfig 3522 +++ b/arch/arm/Kconfig 3523 @@ -1930,6 +1930,10 @@ source "net/Kconfig" 3554 3524 3555 3525 source "drivers/Kconfig" -
trunk/target/linux/omap24xx/patches-2.6.38/501-cbus-retu-irq-nr-fix.patch
r25759 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-27 18:01:26.306458689 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-27 18:05:56.472263901 +0100 5 @@ -205,7 +205,7 @@ 1 --- a/drivers/cbus/retu.c 2 +++ b/drivers/cbus/retu.c 3 @@ -205,7 +205,7 @@ static irqreturn_t retu_irq_handler(int 6 4 return IRQ_NONE; 7 5 } -
trunk/target/linux/omap24xx/patches-2.6.38/505-cbus-retu-write-lock.patch
r25757 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-26 23:23:34.014429906 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-26 23:25:18.905358127 +0100 5 @@ -120,7 +120,9 @@ 1 --- a/drivers/cbus/retu.c 2 +++ b/drivers/cbus/retu.c 3 @@ -120,7 +120,9 @@ void retu_write_reg(struct device *child 6 4 { 7 5 struct retu *retu = dev_get_drvdata(child->parent); -
trunk/target/linux/omap24xx/patches-2.6.38/506-cbus-retu-irq-handler-locking.patch
r25796 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-02-28 15:21:10.645505891 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-02-28 15:22:24.030477769 +0100 1 --- a/drivers/cbus/retu.c 2 +++ b/drivers/cbus/retu.c 5 3 @@ -198,10 +198,12 @@ static irqreturn_t retu_irq_handler(int 6 4 u16 idr; -
trunk/target/linux/omap24xx/patches-2.6.38/510-cbus-retu-defines.patch
r25746 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu.h 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.h 2011-02-25 02:16:28.000000000 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu.h 2011-02-25 23:36:10.363457910 +0100 1 --- a/drivers/cbus/retu.h 2 +++ b/drivers/cbus/retu.h 5 3 @@ -40,6 +40,8 @@ 6 4 #define RETU_REG_CTRL_CLR 0x0f /* Regulator clear register */ -
trunk/target/linux/omap24xx/patches-2.6.38/520-cbus-tahvo-defines.patch
r25746 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/tahvo.h 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.h 2011-02-25 02:16:28.000000000 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.h 2011-02-25 23:41:00.321263098 +0100 1 --- a/drivers/cbus/tahvo.h 2 +++ b/drivers/cbus/tahvo.h 5 3 @@ -30,12 +30,23 @@ 6 4 #define TAHVO_REG_IDR 0x01 /* Interrupt ID */ -
trunk/target/linux/omap24xx/patches-2.6.38/530-cbus-retu-wdt-preemptible.patch
r25832 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-02 16:08:59.022211654 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-02 16:29:43.215284501 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -58,13 +58,11 @@ struct retu_wdt_dev { 6 4 struct device *dev; -
trunk/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch
r25832 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-02 16:46:24.574676092 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-02 16:48:17.469807413 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -56,7 +56,7 @@ static int counter_param = RETU_WDT_MAX_ 6 4 -
trunk/target/linux/omap24xx/patches-2.6.38/534-cbus-retu-wdt-remove-unused-interfaces.patch
r25863 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 15:45:37.533948567 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 15:46:21.312816961 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -52,7 +52,6 @@ static DEFINE_MUTEX(retu_wdt_mutex); 6 4 -
trunk/target/linux/omap24xx/patches-2.6.38/535-cbus-retu-wdt-cleanup.patch
r25863 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 15:46:21.312816961 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 15:46:54.658384947 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -124,9 +124,9 @@ static int retu_wdt_release(struct inode 6 4 struct retu_wdt_dev *wdev = file->private_data; -
trunk/target/linux/omap24xx/patches-2.6.38/540-cbus-retu-wdt-remove-static-variables.patch
r25863 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 16:22:03.524019824 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 16:22:31.186357952 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -7,6 +7,8 @@ 6 4 * -
trunk/target/linux/omap24xx/patches-2.6.38/545-cbus-retu-wdt-constify-info-struct.patch
r25863 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-04 16:21:39.106113985 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-04 16:21:48.503540758 +0100 1 --- a/drivers/cbus/retu-wdt.c 2 +++ b/drivers/cbus/retu-wdt.c 5 3 @@ -149,7 +149,7 @@ static long retu_wdt_ioctl(struct file * 6 4 struct retu_wdt_dev *wdev = container_of(mdev, struct retu_wdt_dev, miscdev); -
trunk/target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-ptr-fix.patch
r25979 r26905 1 Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:47:41.147540155 +0100 4 +++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:50:59.658485748 +0100 1 --- a/drivers/cbus/tahvo-usb.c 2 +++ b/drivers/cbus/tahvo-usb.c 5 3 @@ -99,7 +99,7 @@ struct tahvo_usb { 6 4 int tahvo_mode; -
trunk/target/linux/omap24xx/patches-2.6.38/595-cbus-tahvo-usb-leak.patch
r25979 r26905 1 Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:51:46.240795227 +0100 4 +++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:52:34.430126706 +0100 1 --- a/drivers/cbus/tahvo-usb.c 2 +++ b/drivers/cbus/tahvo-usb.c 5 3 @@ -725,6 +725,8 @@ static int __init tahvo_usb_probe(struct 6 4 -
trunk/target/linux/omap24xx/patches-2.6.38/596-cbus-tahvo-usb-clk.patch
r25979 r26905 1 Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-09 18:55:47.177917578 +0100 4 +++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-09 18:58:35.869996276 +0100 1 --- a/drivers/cbus/tahvo-usb.c 2 +++ b/drivers/cbus/tahvo-usb.c 5 3 @@ -98,6 +98,7 @@ struct tahvo_usb { 6 4 #ifdef CONFIG_USB_OTG -
trunk/target/linux/omap24xx/patches-2.6.38/597-cbus-tahvo-usb-platform.patch
r25979 r26905 1 Index: linux-2.6.38-rc7/arch/arm/mach-omap2/board-n8x0.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/board-n8x0.c 2011-03-09 18:47:07.749508720 +0100 4 +++ linux-2.6.38-rc7/arch/arm/mach-omap2/board-n8x0.c 2011-03-09 18:59:14.355835051 +0100 1 --- a/arch/arm/mach-omap2/board-n8x0.c 2 +++ b/arch/arm/mach-omap2/board-n8x0.c 5 3 @@ -40,6 +40,7 @@ 6 4 #include <plat/serial.h> -
trunk/target/linux/omap24xx/patches-2.6.38/600-tsc2005.patch
r25746 r26905 6 6 4 files changed, 1000 insertions(+) 7 7 8 Index: linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig 9 =================================================================== 10 --- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Kconfig 2011-02-22 02:25:52.000000000 +0100 11 +++ linux-2.6.38-rc6/drivers/input/touchscreen/Kconfig 2011-02-24 00:23:46.456893349 +0100 12 @@ -629,6 +629,17 @@ 8 --- a/drivers/input/touchscreen/Kconfig 9 +++ b/drivers/input/touchscreen/Kconfig 10 @@ -629,6 +629,17 @@ config TOUCHSCREEN_TOUCHIT213 13 11 To compile this driver as a module, choose M here: the 14 12 module will be called touchit213. … … 28 26 tristate "TSC2007 based touchscreens" 29 27 depends on I2C 30 Index: linux-2.6.38-rc6/drivers/input/touchscreen/Makefile 31 =================================================================== 32 --- linux-2.6.38-rc6.orig/drivers/input/touchscreen/Makefile 2011-02-22 02:25:52.000000000 +0100 33 +++ linux-2.6.38-rc6/drivers/input/touchscreen/Makefile 2011-02-24 00:23:46.457893305 +0100 34 @@ -45,6 +45,7 @@ 28 --- a/drivers/input/touchscreen/Makefile 29 +++ b/drivers/input/touchscreen/Makefile 30 @@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += t 35 31 obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o 36 32 obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o … … 40 36 obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o 41 37 obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o 42 Index: linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c 43 =================================================================== 44 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 45 +++ linux-2.6.38-rc6/drivers/input/touchscreen/tsc2005.c 2011-02-24 00:23:46.459893217 +0100 38 --- /dev/null 39 +++ b/drivers/input/touchscreen/tsc2005.c 46 40 @@ -0,0 +1,958 @@ 47 41 +/* … … 1003 997 +MODULE_LICENSE("GPL"); 1004 998 +MODULE_ALIAS("platform:tsc2005"); 1005 Index: linux-2.6.38-rc6/include/linux/spi/tsc2005.h 1006 =================================================================== 1007 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1008 +++ linux-2.6.38-rc6/include/linux/spi/tsc2005.h 2011-02-24 00:23:46.459893217 +0100 999 --- /dev/null 1000 +++ b/include/linux/spi/tsc2005.h 1009 1001 @@ -0,0 +1,30 @@ 1010 1002 +#ifndef _LINUX_SPI_TSC2005_H -
trunk/target/linux/omap24xx/patches-2.6.38/710-evdev-events-without-grab.patch
r25746 r26905 3 3 1 file changed, 7 insertions(+), 3 deletions(-) 4 4 5 Index: linux-2.6.38-rc6/drivers/input/evdev.c 6 =================================================================== 7 --- linux-2.6.38-rc6.orig/drivers/input/evdev.c 2011-02-22 02:25:52.000000000 +0100 8 +++ linux-2.6.38-rc6/drivers/input/evdev.c 2011-02-24 00:23:52.155643164 +0100 9 @@ -78,7 +78,7 @@ 5 --- a/drivers/input/evdev.c 6 +++ b/drivers/input/evdev.c 7 @@ -78,7 +78,7 @@ static void evdev_event(struct input_han 10 8 unsigned int type, unsigned int code, int value) 11 9 { … … 16 14 17 15 do_gettimeofday(&event.time); 18 @@ -89,9 +89,13 @@ 16 @@ -89,9 +89,13 @@ static void evdev_event(struct input_han 19 17 rcu_read_lock(); 20 18 -
trunk/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
r25747 r26905 1 Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100 4 +++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 00:58:54.735744872 +0100 5 @@ -1456,6 +1456,7 @@ 1 --- a/drivers/mmc/host/omap.c 2 +++ b/drivers/mmc/host/omap.c 3 @@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct 6 4 host->dma_ch = -1; 7 5 … … 11 9 host->virt_base = ioremap(res->start, res->end - res->start + 1); 12 10 if (!host->virt_base) 13 @@ -1495,7 +1496,9 @@ 11 @@ -1495,7 +1496,9 @@ static int __init mmc_omap_probe(struct 14 12 } 15 13 } … … 22 20 return 0; 23 21 24 Index: linux-2.6.38-rc6/drivers/mmc/core/core.c 25 =================================================================== 26 --- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100 27 +++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-27 00:57:32.633556994 +0100 28 @@ -75,12 +75,13 @@ 22 --- a/drivers/mmc/core/core.c 23 +++ b/drivers/mmc/core/core.c 24 @@ -75,12 +75,13 @@ static int mmc_schedule_delayed_work(str 29 25 } 30 26 … … 42 38 /** 43 39 * mmc_request_done - finish processing an MMC request 44 Index: linux-2.6.38-rc6/include/linux/mmc/host.h 45 =================================================================== 46 --- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100 47 +++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-27 00:57:32.633556994 +0100 48 @@ -326,5 +326,7 @@ 40 --- a/include/linux/mmc/host.h 41 +++ b/include/linux/mmc/host.h 42 @@ -325,5 +325,7 @@ static inline int mmc_card_is_powered_re 49 43 return host->pm_flags & MMC_PM_KEEP_POWER; 50 44 } -
trunk/target/linux/omap24xx/patches-2.6.38/811-mmc-null-ptr-fix.patch
r25758 r26905 1 Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-27 16:56:51.714348509 +0100 4 +++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 16:57:30.796529124 +0100 5 @@ -832,7 +832,7 @@ 1 --- a/drivers/mmc/host/omap.c 2 +++ b/drivers/mmc/host/omap.c 3 @@ -832,7 +832,7 @@ static irqreturn_t mmc_omap_irq(int irq, 6 4 return IRQ_HANDLED; 7 5 } -
trunk/target/linux/omap24xx/patches-2.6.38/820-backlight-fixes.patch
r25746 r26905 3 3 1 file changed, 18 insertions(+) 4 4 5 Index: linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 6 =================================================================== 7 --- linux-2.6.38-rc6.orig/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-24 12:37:51.702386250 +0100 8 +++ linux-2.6.38-rc6/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-02-24 12:39:35.223028410 +0100 9 @@ -34,8 +34,26 @@ 5 --- a/arch/arm/mach-omap2/board-n8x0-lcd.c 6 +++ b/arch/arm/mach-omap2/board-n8x0-lcd.c 7 @@ -34,8 +34,26 @@ static void mipid_shutdown(struct mipid_ 10 8 } 11 9 } -
trunk/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch
r25939 r26905 1 Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/serial.c 2011-03-07 17:24:16.786259530 +0100 4 +++ linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c 2011-03-07 17:24:18.951998600 +0100 1 --- a/arch/arm/mach-omap2/serial.c 2 +++ b/arch/arm/mach-omap2/serial.c 5 3 @@ -660,6 +660,8 @@ static void serial_out_override(struct u 6 4 } -
trunk/target/linux/omap24xx/patches-2.6.38/850-musb-tusb-modular-fixes.patch
r25907 r26905 1 Index: linux-2.6.38-rc7/drivers/Makefile 2 =================================================================== 3 --- linux-2.6.38-rc7.orig/drivers/Makefile 2011-03-06 18:50:23.464476877 +0100 4 +++ linux-2.6.38-rc7/drivers/Makefile 2011-03-06 18:51:09.485478381 +0100 1 --- a/drivers/Makefile 2 +++ b/drivers/Makefile 5 3 @@ -66,7 +66,7 @@ obj-$(CONFIG_TC) += tc/ 6 4 obj-$(CONFIG_UWB) += uwb/ … … 12 10 obj-$(CONFIG_USB_GADGET) += usb/gadget/ 13 11 obj-$(CONFIG_SERIO) += input/serio/ 14 Index: linux-2.6.38-rc7/drivers/usb/musb/Kconfig 15 =================================================================== 16 --- linux-2.6.38-rc7.orig/drivers/usb/musb/Kconfig 2011-03-06 18:50:23.514483397 +0100 17 +++ linux-2.6.38-rc7/drivers/usb/musb/Kconfig 2011-03-06 18:51:09.486478512 +0100 12 --- a/drivers/usb/musb/Kconfig 13 +++ b/drivers/usb/musb/Kconfig 18 14 @@ -46,7 +46,7 @@ config USB_MUSB_DA8XX 19 15 depends on ARCH_DAVINCI_DA8XX … … 25 21 26 22 config USB_MUSB_OMAP2PLUS 27 Index: linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c 28 =================================================================== 29 --- linux-2.6.38-rc7.orig/drivers/usb/musb/tusb6010.c 2011-03-06 18:50:23.497481181 +0100 30 +++ linux-2.6.38-rc7/drivers/usb/musb/tusb6010.c 2011-03-06 18:51:09.487478643 +0100 23 --- a/drivers/usb/musb/tusb6010.c 24 +++ b/drivers/usb/musb/tusb6010.c 31 25 @@ -55,6 +55,7 @@ u8 tusb_get_revision(struct musb *musb) 32 26 … … 77 71 } 78 72 -module_exit(tusb_exit); 79 Index: linux-2.6.38-rc7/drivers/usb/musb/Makefile 80 =================================================================== 81 --- linux-2.6.38-rc7.orig/drivers/usb/musb/Makefile 2011-03-06 18:50:23.481479093 +0100 82 +++ linux-2.6.38-rc7/drivers/usb/musb/Makefile 2011-03-06 18:51:09.487478643 +0100 73 --- a/drivers/usb/musb/Makefile 74 +++ b/drivers/usb/musb/Makefile 83 75 @@ -13,13 +13,13 @@ musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD) + 84 76 musb_hdrc-$(CONFIG_DEBUG_FS) += musb_debugfs.o … … 102 94 # the kconfig must guarantee that only one of the 103 95 # possible I/O schemes will be enabled at a time ... 104 Index: linux-2.6.38-rc7/drivers/usb/musb/musb_core.c 105 =================================================================== 106 --- linux-2.6.38-rc7.orig/drivers/usb/musb/musb_core.c 2011-03-06 18:50:23.538486528 +0100 107 +++ linux-2.6.38-rc7/drivers/usb/musb/musb_core.c 2011-03-06 18:51:09.489478904 +0100 96 --- a/drivers/usb/musb/musb_core.c 97 +++ b/drivers/usb/musb/musb_core.c 108 98 @@ -2427,8 +2427,13 @@ static struct platform_driver musb_drive 109 99 -
trunk/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch
r25833 r26905 1 Index: linux-2.6.38-rc6/drivers/cbus/Kconfig 2 =================================================================== 3 --- linux-2.6.38-rc6.orig/drivers/cbus/Kconfig 2011-03-01 19:56:10.396378152 +0100 4 +++ linux-2.6.38-rc6/drivers/cbus/Kconfig 2011-03-01 19:56:10.669365669 +0100 1 --- a/drivers/cbus/Kconfig 2 +++ b/drivers/cbus/Kconfig 5 3 @@ -72,4 +72,12 @@ config CBUS_RETU_HEADSET 6 4 to Retu/Vilma. Detection state and events are exposed through … … 16 14 + 17 15 endmenu 18 Index: linux-2.6.38-rc6/drivers/cbus/Makefile 19 =================================================================== 20 --- linux-2.6.38-rc6.orig/drivers/cbus/Makefile 2011-03-01 19:56:10.396378152 +0100 21 +++ linux-2.6.38-rc6/drivers/cbus/Makefile 2011-03-01 19:56:10.669365669 +0100 16 --- a/drivers/cbus/Makefile 17 +++ b/drivers/cbus/Makefile 22 18 @@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r 23 19 obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o … … 27 23 +n810bm-y += lipocharge.o 28 24 +obj-$(CONFIG_N810BM) += n810bm.o 29 Index: linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 30 =================================================================== 31 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 32 +++ linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 2011-03-01 21:15:45.484648402 +0100 25 --- /dev/null 26 +++ b/drivers/cbus/n810bm_main.c 33 27 @@ -0,0 +1,1586 @@ 34 28 +/* … … 1618 1612 +MODULE_LICENSE("GPL"); 1619 1613 +MODULE_AUTHOR("Michael Buesch"); 1620 Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.c 1621 =================================================================== 1622 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1623 +++ linux-2.6.38-rc6/drivers/cbus/lipocharge.c 2011-03-01 19:56:10.672365533 +0100 1614 --- /dev/null 1615 +++ b/drivers/cbus/lipocharge.c 1624 1616 @@ -0,0 +1,183 @@ 1625 1617 +/* … … 1806 1798 + return 0; 1807 1799 +} 1808 Index: linux-2.6.38-rc6/drivers/cbus/lipocharge.h 1809 =================================================================== 1810 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1811 +++ linux-2.6.38-rc6/drivers/cbus/lipocharge.h 2011-03-01 21:07:15.483394264 +0100 1800 --- /dev/null 1801 +++ b/drivers/cbus/lipocharge.h 1812 1802 @@ -0,0 +1,60 @@ 1813 1803 +#ifndef LIPOCHARGE_H_ … … 1871 1861 + 1872 1862 +#endif /* LIPOCHARGE_H_ */ 1873 Index: linux-2.6.38-rc6/drivers/cbus/cbus.c 1874 =================================================================== 1875 --- linux-2.6.38-rc6.orig/drivers/cbus/cbus.c 2011-03-01 19:56:10.396378152 +0100 1876 +++ linux-2.6.38-rc6/drivers/cbus/cbus.c 2011-03-01 19:56:10.673365487 +0100 1863 --- a/drivers/cbus/cbus.c 1864 +++ b/drivers/cbus/cbus.c 1877 1865 @@ -35,6 +35,7 @@ 1878 1866 #include <linux/platform_device.h> … … 1897 1885 MODULE_LICENSE("GPL"); 1898 1886 MODULE_AUTHOR("Juha Yrjölä"); 1899 Index: linux-2.6.38-rc6/drivers/cbus/cbus.h 1900 =================================================================== 1901 --- linux-2.6.38-rc6.orig/drivers/cbus/cbus.h 2011-03-01 19:56:10.396378152 +0100 1902 +++ linux-2.6.38-rc6/drivers/cbus/cbus.h 2011-03-01 19:56:10.673365487 +0100 1887 --- a/drivers/cbus/cbus.h 1888 +++ b/drivers/cbus/cbus.h 1903 1889 @@ -26,4 +26,6 @@ 1904 1890 extern int cbus_read_reg(unsigned dev, unsigned reg); … … 1908 1894 + 1909 1895 #endif /* __DRIVERS_CBUS_CBUS_H */ 1910 Index: linux-2.6.38-rc6/drivers/cbus/retu.c 1911 =================================================================== 1912 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.c 2011-03-01 19:56:10.469374814 +0100 1913 +++ linux-2.6.38-rc6/drivers/cbus/retu.c 2011-03-01 19:56:10.674365441 +0100 1896 --- a/drivers/cbus/retu.c 1897 +++ b/drivers/cbus/retu.c 1914 1898 @@ -425,6 +425,11 @@ static int retu_allocate_children(struct 1915 1899 if (!child) … … 1924 1908 } 1925 1909 1926 Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c 1927 =================================================================== 1928 --- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.c 2011-03-01 19:56:10.401377922 +0100 1929 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.c 2011-03-01 19:56:10.674365441 +0100 1910 --- a/drivers/cbus/tahvo.c 1911 +++ b/drivers/cbus/tahvo.c 1930 1912 @@ -54,6 +54,7 @@ static int tahvo_is_betty; 1931 1913 -
trunk/target/linux/uml/Makefile
r26836 r26905 24 24 MAINTAINER:=Florian Fainelli <florian@openwrt.org> 25 25 26 LINUX_VERSION:=2.6.38. 226 LINUX_VERSION:=2.6.38.6 27 27 28 28 include $(INCLUDE_DIR)/target.mk
Note: See TracChangeset
for help on using the changeset viewer.