diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-05 10:13:24 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-05 12:02:34 -0400 |
commit | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (patch) | |
tree | 0ccea95c2b6186ce5886ad2584ba99c128cc74ec /drivers/video/omap/omapfb_main.c | |
parent | c0fc18c5bf016a9d56aee64974c1ccdb87f3c783 (diff) |
[ARM] omap: fix a load of "warning: symbol 'xxx' was not declared. Should it be static?"
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video/omap/omapfb_main.c')
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 06a69e0345de..5a5e407dc45f 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -31,11 +31,14 @@ | |||
31 | #include <mach/dma.h> | 31 | #include <mach/dma.h> |
32 | #include <mach/omapfb.h> | 32 | #include <mach/omapfb.h> |
33 | 33 | ||
34 | #include "lcdc.h" | ||
35 | #include "dispc.h" | ||
36 | |||
34 | #define MODULE_NAME "omapfb" | 37 | #define MODULE_NAME "omapfb" |
35 | 38 | ||
36 | static unsigned int def_accel; | 39 | static unsigned int def_accel; |
37 | static unsigned long def_vram[OMAPFB_PLANE_NUM]; | 40 | static unsigned long def_vram[OMAPFB_PLANE_NUM]; |
38 | static int def_vram_cnt; | 41 | static unsigned int def_vram_cnt; |
39 | static unsigned long def_vxres; | 42 | static unsigned long def_vxres; |
40 | static unsigned long def_vyres; | 43 | static unsigned long def_vyres; |
41 | static unsigned int def_rotate; | 44 | static unsigned int def_rotate; |
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = { | |||
84 | * LCD panel | 87 | * LCD panel |
85 | * --------------------------------------------------------------------------- | 88 | * --------------------------------------------------------------------------- |
86 | */ | 89 | */ |
87 | extern struct lcd_ctrl omap1_int_ctrl; | ||
88 | extern struct lcd_ctrl omap2_int_ctrl; | ||
89 | extern struct lcd_ctrl hwa742_ctrl; | 90 | extern struct lcd_ctrl hwa742_ctrl; |
90 | extern struct lcd_ctrl blizzard_ctrl; | 91 | extern struct lcd_ctrl blizzard_ctrl; |
91 | 92 | ||
92 | static struct lcd_ctrl *ctrls[] = { | 93 | static const struct lcd_ctrl *ctrls[] = { |
93 | #ifdef CONFIG_ARCH_OMAP1 | 94 | #ifdef CONFIG_ARCH_OMAP1 |
94 | &omap1_int_ctrl, | 95 | &omap1_int_ctrl, |
95 | #else | 96 | #else |