aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 11:14:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 11:14:47 -0700
commitf5fc87905ea075a0b14878086fd4fe38be128844 (patch)
tree09d7ad146b737caefb472534de95ef53f95d7e65 /drivers/base/Makefile
parentd4e06701b89286a306b31e20ec69a904fae374a1 (diff)
parent90923351d480fffd0d24646db83f6f8315eed0d9 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regulator: Convert tps65023 to use regmap API regmap: Add SPI bus support regmap: Add I2C bus support regmap: Add generic non-memory mapped register access API
Diffstat (limited to 'drivers/base/Makefile')
-rw-r--r--drivers/base/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 5ab0d07c457..99a375ad2cc 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -17,6 +17,7 @@ ifeq ($(CONFIG_SYSFS),y)
obj-$(CONFIG_MODULES) += module.o
endif
obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
+obj-$(CONFIG_REGMAP) += regmap/
ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG