diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:22:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:22:47 -0400 |
commit | 3b72e4415438538c0967fd1aee930f688ccdf6dd (patch) | |
tree | b3c234f933c4781d028e499b0e12f85f6366591a /drivers/mfd/htc-egpio.c | |
parent | 396b122f6af3d329df3b4d688f6e66de3e2a399a (diff) | |
parent | 64c12e9b7edb0bfce9c5d7db43091b67894d8339 (diff) |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: further unbork the ucb1400 ac97_bus dependencies
mfd: ucb1400 needs GPIO
mfd: ucb1400 sound driver uses/depends on AC97_BUS:
mfd: Don't use NO_IRQ in WM8350
mfd: update TMIO drivers to use the clock API
mfd: twl4030-core irq simplification
mfd: add base support for Dialog DA9030/DA9034 PMICs
mfd: TWL4030 core driver
mfd: support tmiofb cell on tc6393xb
mfd: add OHCI cell to tc6393xb
mfd: Fix htc-egpio compile warning
mfd: do tcb6393xb state restore on resume only if requested
mfd: provide and use setup hook for tc6393xb
mfd: update sm501 debugging/low information messages
mfd: reduce stack usage in mfd-core.c
Diffstat (limited to 'drivers/mfd/htc-egpio.c')
-rw-r--r-- | drivers/mfd/htc-egpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index 6be43172dc65..50dff6e0088d 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c | |||
@@ -289,7 +289,7 @@ static int __init egpio_probe(struct platform_device *pdev) | |||
289 | ei->base_addr = ioremap_nocache(res->start, res->end - res->start); | 289 | ei->base_addr = ioremap_nocache(res->start, res->end - res->start); |
290 | if (!ei->base_addr) | 290 | if (!ei->base_addr) |
291 | goto fail; | 291 | goto fail; |
292 | pr_debug("EGPIO phys=%08x virt=%p\n", res->start, ei->base_addr); | 292 | pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr); |
293 | 293 | ||
294 | if ((pdata->bus_width != 16) && (pdata->bus_width != 32)) | 294 | if ((pdata->bus_width != 16) && (pdata->bus_width != 32)) |
295 | goto fail; | 295 | goto fail; |