pxa: mark as broken
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 270-regmap_dynamic.patch
1 --- a/drivers/base/regmap/Kconfig
2 +++ b/drivers/base/regmap/Kconfig
3 @@ -3,16 +3,18 @@
4 # subsystems should select the appropriate symbols.
5
6 config REGMAP
7 - default y if (REGMAP_I2C || REGMAP_SPI)
8 select LZO_COMPRESS
9 select LZO_DECOMPRESS
10 - bool
11 + tristate "Regmap"
12
13 config REGMAP_I2C
14 - tristate
15 + select REGMAP
16 + tristate "Regmap I2C"
17
18 config REGMAP_SPI
19 - tristate
20 + select REGMAP
21 + depends on SPI_MASTER
22 + tristate "Regmap SPI"
23
24 config REGMAP_IRQ
25 bool
26 --- a/drivers/base/regmap/Makefile
27 +++ b/drivers/base/regmap/Makefile
28 @@ -1,6 +1,8 @@
29 -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
30 -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
31 -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
32 +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o
33 +ifdef CONFIG_DEBUG_FS
34 +regmap-core-objs += regmap-debugfs.o
35 +endif
36 +obj-$(CONFIG_REGMAP) += regmap-core.o
37 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
38 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
39 obj-$(CONFIG_REGMAP_IRQ) += regmap-irq.o
40 --- a/drivers/base/regmap/regmap.c
41 +++ b/drivers/base/regmap/regmap.c
42 @@ -13,6 +13,7 @@
43 #include <linux/slab.h>
44 #include <linux/module.h>
45 #include <linux/mutex.h>
46 +#include <linux/module.h>
47 #include <linux/err.h>
48
49 #define CREATE_TRACE_POINTS
50 @@ -679,3 +680,5 @@ static int __init regmap_initcall(void)
51 return 0;
52 }
53 postcore_initcall(regmap_initcall);
54 +
55 +MODULE_LICENSE("GPL");