kernel: update bcma and ssb to master-2013-01-09 from wireless-testing

[oweals/openwrt.git] / target / linux / generic / patches-3.3 / 270-regmap_dynamic.patch

diff --git a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
index a583cb4c40b3176aaf56c068721f829a91f60115..d6c32b4dcf76d3c5c70d4631d87d644974054ab2 100644 (file)
--- a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
@@ -1,7 +1,5 @@
-Index: linux-3.3.8/drivers/base/regmap/Kconfig
-===================================================================
---- linux-3.3.8.orig/drivers/base/regmap/Kconfig       2013-01-04 23:40:36.288481779 +0100
-+++ linux-3.3.8/drivers/base/regmap/Kconfig    2013-01-04 23:40:39.760481927 +0100
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
 @@ -3,16 +3,17 @@
  # subsystems should select the appropriate symbols.
  
@@ -24,16 +22,14 @@ Index: linux-3.3.8/drivers/base/regmap/Kconfig
  
  config REGMAP_IRQ
        bool
-Index: linux-3.3.8/drivers/base/regmap/Makefile
-===================================================================
---- linux-3.3.8.orig/drivers/base/regmap/Makefile      2012-06-01 09:16:13.000000000 +0200
-+++ linux-3.3.8/drivers/base/regmap/Makefile   2013-01-05 00:20:31.236584162 +0100
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
 @@ -1,6 +1,8 @@
 -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
 -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
 -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
 +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o
-+ifdef CONFIG_DEBUGFS
++ifdef CONFIG_DEBUG_FS
 +regmap-core-objs += regmap-debugfs.o
 +endif
 +obj-$(CONFIG_REGMAP) += regmap-core.o