diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 17:12:16 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 17:12:16 +0900 |
| commit | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (patch) | |
| tree | 77ab8003db1d6ccbcf3a9acafad26002fba37b63 /arch/arm/mach-s3c2412/mach-jive.c | |
| parent | b8c193f88ebd8705b3e916532539031cd9fc0b4c (diff) | |
| parent | 8c31813f31cd4403b46802866949a95a6e8fa584 (diff) | |
| download | linux-next-4db25d496c09fdf094d52d11a90ae51f9ee473c6.tar.gz | |
Merge branch 'sh/stable-updates' into sh/for-2.6.30
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 332bd3263eaf..8f0d37d43b43 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c @@ -52,7 +52,6 @@ #include <plat/cpu.h> #include <plat/pm.h> #include <plat/udc.h> -#include <plat/iic.h> static struct map_desc jive_iodesc[] __initdata = { }; @@ -278,7 +277,7 @@ __setup("mtdset=", jive_mtdset); #define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN) #define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN) -struct s3c2410fb_display jive_vgg2432a4_display[] = { +static struct s3c2410fb_display jive_vgg2432a4_display[] = { [0] = { .width = LCD_XRES, .height = LCD_YRES, @@ -311,7 +310,7 @@ struct s3c2410fb_display jive_vgg2432a4_display[] = { #define S3C2410_GPCCON_MASK(x) (3 << ((x) * 2)) #define S3C2410_GPDCON_MASK(x) (3 << ((x) * 2)) -struct s3c2410fb_mach_info jive_lcd_config = { +static struct s3c2410fb_mach_info jive_lcd_config = { .displays = jive_vgg2432a4_display, .num_displays = ARRAY_SIZE(jive_vgg2432a4_display), .default_display = 0, |