projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
hsmmc.h
diff --git
a/arch/arm/mach-omap2/hsmmc.h
b/arch/arm/mach-omap2/hsmmc.h
index
148cd9b
..
69b619d
100644
(file)
--- a/
arch/arm/mach-omap2/hsmmc.h
+++ b/
arch/arm/mach-omap2/hsmmc.h
@@
-28,7
+28,7
@@
struct omap2_hsmmc_info {
void (*init_card)(struct mmc_card *card);
};
void (*init_card)(struct mmc_card *card);
};
-#if
defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE
)
+#if
IS_ENABLED(CONFIG_MMC_OMAP_HS
)
void omap_hsmmc_init(struct omap2_hsmmc_info *);
void omap_hsmmc_late_init(struct omap2_hsmmc_info *);
void omap_hsmmc_init(struct omap2_hsmmc_info *);
void omap_hsmmc_late_init(struct omap2_hsmmc_info *);