diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-17 21:35:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-17 21:35:44 +0100 |
| commit | c917c1d0151667768d22fb96d083a11e3dac5f36 (patch) | |
| tree | b9904286faba7f57e8c1a4da6206cc6a255a9dd3 /arch/arm/mach-s3c2412/mach-jive.c | |
| parent | 77f4025b5e7b290f5c3cc03aa6242328694c71d4 (diff) | |
| parent | 0c3ee078251b85812e585b5cf5d1635afd73f4e2 (diff) | |
Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
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 332bd3263ea..8f0d37d43b4 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, |