kernel: fix arch-dependent bug in hso module

[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 eaa6dbf367a0e1b0fefffb532399642936a75181..b1cfc8a6281db22cd37723649ab49c5faf97544a 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,6 +1,6 @@
 --- a/drivers/base/regmap/Kconfig
 +++ b/drivers/base/regmap/Kconfig
-@@ -3,15 +3,16 @@
+@@ -3,16 +3,18 @@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
@@ -8,14 +8,48 @@
        select LZO_COMPRESS
        select LZO_DECOMPRESS
 -      bool
-+      tristate
++      tristate "Regmap"
  
  config REGMAP_I2C
+-      tristate
 +      select REGMAP
-       tristate
++      tristate "Regmap I2C"
  
  config REGMAP_SPI
+-      tristate
 +      select REGMAP
-       tristate
++      depends on SPI_MASTER
++      tristate "Regmap SPI"
  
  config REGMAP_IRQ
+       bool
+--- 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_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_IRQ) += regmap-irq.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/mutex.h>
++#include <linux/module.h>
+ #include <linux/err.h>
+ 
+ #define CREATE_TRACE_POINTS
+@@ -679,3 +680,5 @@ static int __init regmap_initcall(void)
+       return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");