Changeset 35016


Ignore:
Timestamp:
2013-01-05T14:33:44+01:00 (5 years ago)
Author:
nbd
Message:

kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions

Location:
trunk/target/linux/generic
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.3/270-regmap_dynamic.patch

    r35015 r35016  
    1 Index: linux-3.3.8/drivers/base/regmap/Kconfig 
    2 =================================================================== 
    3 --- linux-3.3.8.orig/drivers/base/regmap/Kconfig        2013-01-04 23:40:36.288481779 +0100 
    4 +++ linux-3.3.8/drivers/base/regmap/Kconfig     2013-01-04 23:40:39.760481927 +0100 
     1--- a/drivers/base/regmap/Kconfig 
     2+++ b/drivers/base/regmap/Kconfig 
    53@@ -3,16 +3,17 @@ 
    64 # subsystems should select the appropriate symbols. 
     
    2523 config REGMAP_IRQ 
    2624        bool 
    27 Index: linux-3.3.8/drivers/base/regmap/Makefile 
    28 =================================================================== 
    29 --- linux-3.3.8.orig/drivers/base/regmap/Makefile       2012-06-01 09:16:13.000000000 +0200 
    30 +++ linux-3.3.8/drivers/base/regmap/Makefile    2013-01-05 00:20:31.236584162 +0100 
     25--- a/drivers/base/regmap/Makefile 
     26+++ b/drivers/base/regmap/Makefile 
    3127@@ -1,6 +1,8 @@ 
    3228-obj-$(CONFIG_REGMAP) += regmap.o regcache.o 
  • trunk/target/linux/generic/patches-3.6/270-regmap_dynamic.patch

    r34999 r35016  
    3636 enum regmap_endian { 
    3737        /* Unspecified -> 0 -> Backwards compatible default */ 
     38--- a/drivers/base/regmap/Makefile 
     39+++ b/drivers/base/regmap/Makefile 
     40@@ -1,6 +1,8 @@ 
     41-obj-$(CONFIG_REGMAP) += regmap.o regcache.o 
     42-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o 
     43-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o 
     44+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o 
     45+ifdef CONFIG_DEBUG_FS 
     46+regmap-core-objs += regmap-debugfs.o 
     47+endif 
     48+obj-$(CONFIG_REGMAP) += regmap-core.o 
     49 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o 
     50 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o 
     51 obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o 
  • trunk/target/linux/generic/patches-3.7/259-regmap_dynamic.patch

    r35015 r35016  
    1 Index: linux-3.7.1/drivers/base/regmap/Kconfig 
    2 =================================================================== 
    3 --- linux-3.7.1.orig/drivers/base/regmap/Kconfig        2012-12-17 20:14:54.000000000 +0100 
    4 +++ linux-3.7.1/drivers/base/regmap/Kconfig     2013-01-05 01:07:25.712704474 +0100 
     1--- a/drivers/base/regmap/Kconfig 
     2+++ b/drivers/base/regmap/Kconfig 
    53@@ -3,20 +3,23 @@ 
    64 # subsystems should select the appropriate symbols. 
     
    3129+       select REGMAP 
    3230        bool 
    33 Index: linux-3.7.1/include/linux/regmap.h 
    34 =================================================================== 
    35 --- linux-3.7.1.orig/include/linux/regmap.h     2012-12-17 20:14:54.000000000 +0100 
    36 +++ linux-3.7.1/include/linux/regmap.h  2013-01-05 01:03:32.012694484 +0100 
    37 @@ -43,7 +43,7 @@ 
     31--- a/include/linux/regmap.h 
     32+++ b/include/linux/regmap.h 
     33@@ -43,7 +43,7 @@ struct reg_default { 
    3834        unsigned int def; 
    3935 }; 
     
    4440 enum regmap_endian { 
    4541        /* Unspecified -> 0 -> Backwards compatible default */ 
    46 Index: linux-3.7.1/drivers/base/regmap/Makefile 
    47 =================================================================== 
    48 --- linux-3.7.1.orig/drivers/base/regmap/Makefile       2012-12-17 20:14:54.000000000 +0100 
    49 +++ linux-3.7.1/drivers/base/regmap/Makefile    2013-01-05 01:08:16.592706650 +0100 
     42--- a/drivers/base/regmap/Makefile 
     43+++ b/drivers/base/regmap/Makefile 
    5044@@ -1,6 +1,8 @@ 
    5145-obj-$(CONFIG_REGMAP) += regmap.o regcache.o 
Note: See TracChangeset for help on using the changeset viewer.