diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 22:41:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 22:41:49 +0400 |
| commit | 55a6fbf8fc57d7b60d5028663f534475c4965215 (patch) | |
| tree | fbe6b7ef5251d11b60c72d5d07d03312b6c22d44 /drivers/mfd/twl4030-core.c | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
| parent | 2021de874e9f09774616772cfdefdab0e6193b09 (diff) | |
| download | linux-55a6fbf8fc57d7b60d5028663f534475c4965215.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: early init for MFD running regulators
mfd: fix tmio related warnings
mfd: asic3: enable SD/SDIO cell
mfd: asic3: enable DS1WM cell
mfd: asic3: remove SD/SDIO controller register definitions
mfd: asic3: use resource_size macro instead of local variable
mfd: add ASIC3 IRQ numbers
mfd: asic3: add clock handling for MFD cells
mfd: asic3: add asic3_set_register common operation
mfd: Fix Kconfig help text for WM8350
mfd: add PCAP driver
mfd: add U300 AB3100 core support
drivers/mfd: remove obsolete irq_desc_t typedef
mfd/pcf50633-gpio.c: add MODULE_LICENSE
mfd: Mark WM8350 mask revision as readable to match silicon
mfd: Mark clocks_init as non-init in twl4030-core.c
mfd: Correct readability of WM8350 register 227
Diffstat (limited to 'drivers/mfd/twl4030-core.c')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index ec90e953adce..cd1008c19cd7 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -647,7 +647,7 @@ static inline int __init unprotect_pm_master(void) return e; } -static void __init clocks_init(struct device *dev) +static void clocks_init(struct device *dev) { int e = 0; struct clk *osc; |