projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
board
/
ti
/
beagle
/
beagle.c
diff --git
a/board/ti/beagle/beagle.c
b/board/ti/beagle/beagle.c
index
c1365e2
..
00d127e
100644
(file)
--- a/
board/ti/beagle/beagle.c
+++ b/
board/ti/beagle/beagle.c
@@
-524,14
+524,14
@@
void set_muxconf_regs(void)
MUX_BEAGLE();
}
MUX_BEAGLE();
}
-#if defined(CONFIG_
GENERIC_
MMC)
+#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
-#if defined(CONFIG_
GENERIC_
MMC)
+#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);