projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
board-h4.c
diff --git
a/arch/arm/mach-omap2/board-h4.c
b/arch/arm/mach-omap2/board-h4.c
index 0c1bdd7ee32d7d3817b10c46c28b8fd7e072aa49..69c0acf5aa63cbf9f9f0eaeb89edb0bc52c6590c 100644
(file)
--- a/
arch/arm/mach-omap2/board-h4.c
+++ b/
arch/arm/mach-omap2/board-h4.c
@@
-246,7
+246,7
@@
static u32 is_gpmc_muxed(void)
return 0;
}
-#if
defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE
)
+#if
IS_ENABLED(CONFIG_SMC91X
)
static struct omap_smc91x_platform_data board_smc91x_data = {
.cs = 1,