projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
board-htcherald.c
diff --git
a/arch/arm/mach-omap1/board-htcherald.c
b/arch/arm/mach-omap1/board-htcherald.c
index
9525ef9
..
e424df9
100644
(file)
--- a/
arch/arm/mach-omap1/board-htcherald.c
+++ b/
arch/arm/mach-omap1/board-htcherald.c
@@
-401,7
+401,7
@@
static struct platform_device lcd_device = {
};
/* MMC Card */
};
/* MMC Card */
-#if
defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE
)
+#if
IS_ENABLED(CONFIG_MMC_OMAP
)
static struct omap_mmc_platform_data htc_mmc1_data = {
.nr_slots = 1,
.switch_slot = NULL,
static struct omap_mmc_platform_data htc_mmc1_data = {
.nr_slots = 1,
.switch_slot = NULL,
@@
-586,7
+586,7
@@
static void __init htcherald_init(void)
omap_register_i2c_bus(1, 100, NULL, 0);
omap_register_i2c_bus(1, 100, NULL, 0);
-#if
defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE
)
+#if
IS_ENABLED(CONFIG_MMC_OMAP
)
htc_mmc_data[0] = &htc_mmc1_data;
omap1_init_mmc(htc_mmc_data, 1);
#endif
htc_mmc_data[0] = &htc_mmc1_data;
omap1_init_mmc(htc_mmc_data, 1);
#endif