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 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
fb.c
diff --git
a/arch/arm/mach-omap2/fb.c
b/arch/arm/mach-omap2/fb.c
index
1f1ecf8
..
ecd00b6
100644
(file)
--- a/
arch/arm/mach-omap2/fb.c
+++ b/
arch/arm/mach-omap2/fb.c
@@
-90,7
+90,7
@@
int __init omap_init_vrfb(void)
int __init omap_init_vrfb(void) { return 0; }
#endif
-#if
defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE
)
+#if
IS_ENABLED(CONFIG_FB_OMAP2
)
static u64 omap_fb_dma_mask = ~(u32)0;
static struct omapfb_platform_data omapfb_config;