Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / mach-bast.c

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 587864fe25fb09f169b519dcc16d54dbb13c773d..66175471fff30492ebf45e8a4518b20af5915344 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -530,7 +530,7 @@ static struct s3c2410fb_mach_info __initdata bast_fb_info = {
 
        .displays = bast_lcd_info,
        .num_displays = ARRAY_SIZE(bast_lcd_info),
-       .default_display = 4,
+       .default_display = 1,
 };
 
 /* Standard BAST devices */
@@ -540,7 +540,6 @@ static struct platform_device *bast_devices[] __initdata = {
        &s3c_device_lcd,
        &s3c_device_wdt,
        &s3c_device_i2c,
-       &s3c_device_iis,
        &s3c_device_rtc,
        &s3c_device_nand,
        &bast_device_nor,