diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:42:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:42:18 -0400 |
| commit | b0189cd087aa82bd23277cb5c8960ab030e13e5c (patch) | |
| tree | 7b1a4c152cd62ce136fd5b0e4379d58eb2244e66 /drivers/mfd/Makefile | |
| parent | 69f1d1a6acbaa7d83ef3f4ee26209c58cd000204 (diff) | |
| parent | bc574e190d3fbed37d724e33a16aee326d6f2ac4 (diff) | |
Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
OMAP: Add debugfs node to show the summary of all clocks
OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
OMAP2+: PM: idle clkdms only if already in idle
OMAP2+: clockdomain: add clkdm_in_hwsup()
OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
OMAP4: hwmod: Introduce the module control in hwmod control
OMAP4: cm: Add two new APIs for modulemode control
OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
OMAP4: hwmod data: Add PRM context register offset
OMAP4: prm: Remove deprecated functions
OMAP4: prm: Replace warm reset API with the offset based version
OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
OMAP: hwmod: Wait the idle status to be disabled
OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
OMAP2+: hwmod: Init clkdm field at boot time
OMAP4: hwmod data: Add clock domain attribute
OMAP4: clock data: Add missing divider selection for auxclks
...
Diffstat (limited to 'drivers/mfd/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index d7d47d2a4c76..22a280fcb705 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile | |||
| @@ -40,8 +40,9 @@ obj-$(CONFIG_MENELAUS) += menelaus.o | |||
| 40 | obj-$(CONFIG_TWL4030_CORE) += twl-core.o twl4030-irq.o twl6030-irq.o | 40 | obj-$(CONFIG_TWL4030_CORE) += twl-core.o twl4030-irq.o twl6030-irq.o |
| 41 | obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o | 41 | obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o |
| 42 | obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o | 42 | obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o |
| 43 | obj-$(CONFIG_TWL4030_CODEC) += twl4030-codec.o | 43 | obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o |
| 44 | obj-$(CONFIG_TWL6030_PWM) += twl6030-pwm.o | 44 | obj-$(CONFIG_TWL6030_PWM) += twl6030-pwm.o |
| 45 | obj-$(CONFIG_TWL6040_CORE) += twl6040-core.o twl6040-irq.o | ||
| 45 | 46 | ||
| 46 | obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o | 47 | obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o |
| 47 | 48 | ||