git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
board-trout-mmc.c
diff --git
a/arch/arm/mach-msm/board-trout-mmc.c
b/arch/arm/mach-msm/board-trout-mmc.c
index
44be846
..
f7a9724
100644
(file)
--- a/
arch/arm/mach-msm/board-trout-mmc.c
+++ b/
arch/arm/mach-msm/board-trout-mmc.c
@@
-174,7
+174,7
@@
int __init trout_init_mmc(unsigned int sys_rev)
if (IS_ERR(vreg_sdslot))
return PTR_ERR(vreg_sdslot);
- set_irq_wake(TROUT_GPIO_TO_INT(TROUT_GPIO_SDMC_CD_N), 1);
+
irq_
set_irq_wake(TROUT_GPIO_TO_INT(TROUT_GPIO_SDMC_CD_N), 1);
if (!opt_disable_sdcard)
msm_add_sdcc(2, &trout_sdslot_data,