OSDN Git Service
(root)
/
uclinux-h8
/
linux.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...
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-omap2
/
board-2430sdp.c
diff --git
a/arch/arm/mach-omap2/board-2430sdp.c
b/arch/arm/mach-omap2/board-2430sdp.c
index
e551aae
..
244d8a5
100644
(file)
--- a/
arch/arm/mach-omap2/board-2430sdp.c
+++ b/
arch/arm/mach-omap2/board-2430sdp.c
@@
-135,7
+135,7
@@
static struct omap_dss_board_info sdp2430_dss_data = {
.default_device = &sdp2430_lcd_device,
};
-#if
defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE
)
+#if
IS_ENABLED(CONFIG_SMC91X
)
static struct omap_smc91x_platform_data board_smc91x_data = {
.cs = 5,