diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 20:57:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 20:57:08 -0700 |
| commit | 2d12a18b89f5e3c0cce1981cc257228bfbf9039f (patch) | |
| tree | 18aa9b66f6cc981196e911105676aad0bc25ad26 /drivers/mfd/Makefile | |
| parent | 121782a248f11c63c7c0fc78d4a68a54e99ee37d (diff) | |
| parent | 8509e142567d69e170a184ecf27d7a6a3239fd72 (diff) | |
| download | op-kernel-dev-2d12a18b89f5e3c0cce1981cc257228bfbf9039f.zip op-kernel-dev-2d12a18b89f5e3c0cce1981cc257228bfbf9039f.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Add Makefile and Kconfig Entries for tps65911 comparator
mfd: Fix build error for tps65911-comparator.c
Revert "mfd: Add omap-usbhs runtime PM support"
input: pmic8xxx-pwrkey: Do not use mfd_get_data()
input: pmic8xxx-keypad: Do not use mfd_get_data()
Diffstat (limited to 'drivers/mfd/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index efe3cc3..d7d47d2 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -94,3 +94,4 @@ obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o +obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o |
