Changeset 22042


Ignore:
Timestamp:
2010-07-02T00:28:22+02:00 (8 years ago)
Author:
florian
Message:

[kernel] refresh 2.6.34 patches

Location:
trunk/target/linux/generic/patches-2.6.34
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.34/014-samsung_flash.patch

    r21952 r22042  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =  
     3@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
    44 static void cfi_fixup_major_minor(struct cfi_private *cfi, 
    55                                  struct cfi_pri_amdstd *extp) 
     
    1010            extp->MajorVersion == '0') 
    1111                extp->MajorVersion = '1'; 
    12 @@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct  
     12@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
    1313        mtd->name    = map->name; 
    1414        mtd->writesize = 1; 
     
    2020                unsigned char bootloc; 
    2121                /* 
    22 @@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct  
     22@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
    2323  
    2424                cfi_fixup_major_minor(cfi, extp); 
  • trunk/target/linux/generic/patches-2.6.34/890-generic_pwm_api.patch

    r21952 r22042  
    66--- 
    77 
    8 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile 
    9 index 049ff24..b94666c 100644 
    108--- a/drivers/misc/Makefile 
    119+++ b/drivers/misc/Makefile 
     
    1816 obj-$(CONFIG_ATMEL_TCLIB)      += atmel_tclib.o 
    1917 obj-$(CONFIG_ICS932S401)       += ics932s401.o 
    20 diff --git a/drivers/Kconfig b/drivers/Kconfig 
    21 index 368ae6d..54d7b16 100644 
    2218--- a/drivers/Kconfig 
    2319+++ b/drivers/Kconfig 
     
    3127  
    3228 source "drivers/power/Kconfig" 
    33 diff --git a/drivers/Makefile b/drivers/Makefile 
    34 index 6ee53c7..e6143f3 100644 
    3529--- a/drivers/Makefile 
    3630+++ b/drivers/Makefile 
     
    4438 obj-$(CONFIG_PARISC)           += parisc/ 
    4539 obj-$(CONFIG_RAPIDIO)          += rapidio/ 
    46 diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig 
  • trunk/target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch

    r21952 r22042  
    2222 2 files changed, 3 insertions(+), 1 deletion(-) 
    2323 
    24 diff -puN drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure drivers/ssb/main.c 
    25 --- a/drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure 
    26 +++ a/drivers/ssb/main.c 
     24--- a/drivers/ssb/main.c 
     25+++ b/drivers/ssb/main.c 
    2726@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s 
    2827 #ifdef CONFIG_SSB_PCIHOST 
     
    4140                } 
    4241  
    43 diff -puN include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure include/linux/ssb/ssb.h 
    44 --- a/include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure 
    45 +++ a/include/linux/ssb/ssb.h 
     42--- a/include/linux/ssb/ssb.h 
     43+++ b/include/linux/ssb/ssb.h 
    4644@@ -167,7 +167,7 @@ struct ssb_device { 
    4745         * is an optimization. */ 
     
    5351        struct ssb_bus *bus; 
    5452        struct ssb_device_id id; 
    55 _ 
    56 -- 
    57 To unsubscribe from this list: send the line "unsubscribe linux-wireless" in 
    58 the body of a message to majordomo@vger.kernel.org 
    59 More majordomo info at  http://vger.kernel.org/majordomo-info.html 
Note: See TracChangeset for help on using the changeset viewer.