diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:41 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:41 -0500 |
commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /drivers/mfd/Makefile | |
parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) |
Merge branch 'topic/asoc' into for-linus
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 f3b277b90d40..af0fc903cec8 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile | |||
@@ -26,6 +26,7 @@ obj-$(CONFIG_MENELAUS) += menelaus.o | |||
26 | 26 | ||
27 | obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o | 27 | obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o |
28 | obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o | 28 | obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o |
29 | obj-$(CONFIG_TWL4030_CODEC) += twl4030-codec.o | ||
29 | 30 | ||
30 | obj-$(CONFIG_MFD_MC13783) += mc13783-core.o | 31 | obj-$(CONFIG_MFD_MC13783) += mc13783-core.o |
31 | 32 | ||