Merge commit 'v2.6.32-rc6' into next

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index ec71a6965786..1c3382fefdd2 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -144,7 +144,7 @@ static struct s3c2410_udc_mach_info mini2440_udc_cfg __initdata = {
         .type           = (S3C2410_LCDCON1_TFT16BPP |\
                            S3C2410_LCDCON1_TFT)
 
-struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
+static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
         [0] = { /* mini2440 + 3.5" TFT + touchscreen */
                 _LCD_DECLARE(
                         7,                      /* The 3.5 is quite fast */
@@ -191,7 +191,7 @@ struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
 #define S3C2410_GPCCON_MASK(x)  (3 << ((x) * 2))
 #define S3C2410_GPDCON_MASK(x)  (3 << ((x) * 2))
 
-struct s3c2410fb_mach_info mini2440_fb_info __initdata = {
+static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {
         .displays        = &mini2440_lcd_cfg[0], /* not constant! see init */
         .num_displays    = 1,
         .default_display = 0,