diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 20:41:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 20:41:49 +0200 |
commit | 55a6fbf8fc57d7b60d5028663f534475c4965215 (patch) | |
tree | fbe6b7ef5251d11b60c72d5d07d03312b6c22d44 /drivers/mfd/tc6393xb.c | |
parent | Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 (diff) | |
parent | mfd: early init for MFD running regulators (diff) | |
download | linux-55a6fbf8fc57d7b60d5028663f534475c4965215.tar.xz linux-55a6fbf8fc57d7b60d5028663f534475c4965215.zip |
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/tc6393xb.c')
-rw-r--r-- | drivers/mfd/tc6393xb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 9d2abb5d6e2c..1429a7341a9a 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c @@ -136,7 +136,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand) return 0; } -const static struct tmio_mmc_data tc6393xb_mmc_data = { +static struct tmio_mmc_data tc6393xb_mmc_data = { .hclk = 24000000, }; |