diff options
Diffstat (limited to 'arch/arm/mach-omap2/fb.c')
-rw-r--r-- | arch/arm/mach-omap2/fb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c index 2ca33cc0c484..26e28e94f625 100644 --- a/arch/arm/mach-omap2/fb.c +++ b/arch/arm/mach-omap2/fb.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
33 | 33 | ||
34 | #include "soc.h" | 34 | #include "soc.h" |
35 | #include "display.h" | ||
35 | 36 | ||
36 | #ifdef CONFIG_OMAP2_VRFB | 37 | #ifdef CONFIG_OMAP2_VRFB |
37 | 38 | ||
@@ -64,7 +65,7 @@ static const struct resource omap3_vrfb_resources[] = { | |||
64 | DEFINE_RES_MEM_NAMED(0xfc000000u, 0x4000000, "vrfb-area-11"), | 65 | DEFINE_RES_MEM_NAMED(0xfc000000u, 0x4000000, "vrfb-area-11"), |
65 | }; | 66 | }; |
66 | 67 | ||
67 | static int __init omap_init_vrfb(void) | 68 | int __init omap_init_vrfb(void) |
68 | { | 69 | { |
69 | struct platform_device *pdev; | 70 | struct platform_device *pdev; |
70 | const struct resource *res; | 71 | const struct resource *res; |
@@ -85,8 +86,8 @@ static int __init omap_init_vrfb(void) | |||
85 | 86 | ||
86 | return PTR_RET(pdev); | 87 | return PTR_RET(pdev); |
87 | } | 88 | } |
88 | 89 | #else | |
89 | omap_arch_initcall(omap_init_vrfb); | 90 | int __init omap_init_vrfb(void) { return 0; } |
90 | #endif | 91 | #endif |
91 | 92 | ||
92 | #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) | 93 | #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) |
@@ -105,11 +106,10 @@ static struct platform_device omap_fb_device = { | |||
105 | .num_resources = 0, | 106 | .num_resources = 0, |
106 | }; | 107 | }; |
107 | 108 | ||
108 | static int __init omap_init_fb(void) | 109 | int __init omap_init_fb(void) |
109 | { | 110 | { |
110 | return platform_device_register(&omap_fb_device); | 111 | return platform_device_register(&omap_fb_device); |
111 | } | 112 | } |
112 | 113 | #else | |
113 | omap_arch_initcall(omap_init_fb); | 114 | int __init omap_init_fb(void) { return 0; } |
114 | |||
115 | #endif | 115 | #endif |