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 branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
devices.c
diff --git
a/arch/arm/mach-davinci/devices.c
b/arch/arm/mach-davinci/devices.c
index
de40e9c
..
22ebc64
100644
(file)
--- a/
arch/arm/mach-davinci/devices.c
+++ b/
arch/arm/mach-davinci/devices.c
@@
-213,7
+213,7
@@
void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE + 0x7c);
/* Configure pull down control */
IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE + 0x7c);
/* Configure pull down control */
- __raw_writel((__raw_readl(pupdctl1) & ~0x
40
0),
+ __raw_writel((__raw_readl(pupdctl1) & ~0x
fc
0),
pupdctl1);
mmcsd1_resources[0].start = DM365_MMCSD1_BASE;
pupdctl1);
mmcsd1_resources[0].start = DM365_MMCSD1_BASE;