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-omap2
/
hsmmc.c
diff --git
a/arch/arm/mach-omap2/hsmmc.c
b/arch/arm/mach-omap2/hsmmc.c
index
cff079e
..
4780977
100644
(file)
--- a/
arch/arm/mach-omap2/hsmmc.c
+++ b/
arch/arm/mach-omap2/hsmmc.c
@@
-26,7
+26,7
@@
#include "hsmmc.h"
#include "control.h"
-#if
defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE
)
+#if
IS_ENABLED(CONFIG_MMC_OMAP_HS
)
static u16 control_pbias_offset;
static u16 control_devconf1_offset;