Index: linux-3.7.1/drivers/base/regmap/Kconfig
===================================================================
--- linux-3.7.1.orig/drivers/base/regmap/Kconfig	2012-12-17 20:14:54.000000000 +0100
+++ linux-3.7.1/drivers/base/regmap/Kconfig	2013-01-05 01:07:25.712704474 +0100
@@ -3,20 +3,23 @@
 # subsystems should select the appropriate symbols.
 
 config REGMAP
-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_MMIO || REGMAP_IRQ)
 	select LZO_COMPRESS
 	select LZO_DECOMPRESS
 	select IRQ_DOMAIN if REGMAP_IRQ
-	bool
+	tristate "Regmap"
 
 config REGMAP_I2C
-	tristate
+	select REGMAP
+	tristate "Regmap I2C"
 
 config REGMAP_SPI
-	tristate
+	select REGMAP
+	tristate "Regmap SPI"
 
 config REGMAP_MMIO
+	select REGMAP
 	tristate
 
 config REGMAP_IRQ
+	select REGMAP
 	bool
Index: linux-3.7.1/include/linux/regmap.h
===================================================================
--- linux-3.7.1.orig/include/linux/regmap.h	2012-12-17 20:14:54.000000000 +0100
+++ linux-3.7.1/include/linux/regmap.h	2013-01-05 01:03:32.012694484 +0100
@@ -43,7 +43,7 @@
 	unsigned int def;
 };
 
-#ifdef CONFIG_REGMAP
+#if IS_ENABLED(CONFIG_REGMAP)
 
 enum regmap_endian {
 	/* Unspecified -> 0 -> Backwards compatible default */
Index: linux-3.7.1/drivers/base/regmap/Makefile
===================================================================
--- linux-3.7.1.orig/drivers/base/regmap/Makefile	2012-12-17 20:14:54.000000000 +0100
+++ linux-3.7.1/drivers/base/regmap/Makefile	2013-01-05 01:08:16.592706650 +0100
@@ -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_MMIO) += regmap-mmio.o