Merge commit 'v3.2-rc2' into fbdev-next

[karo-tx-linux.git] / arch / arm / mach-at91 / board-sam9rlek.c

diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index 39a28effc3df9d2443211e769c7d7de72508957d..0e943a2d95029e2cd44a63e4bad91243a4239e56 100644 (file)
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -88,19 +88,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        },
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-       *num_partitions = ARRAY_SIZE(ek_nand_partition);
-       return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 //     .det_pin        = ... not connected
        .rdy_pin        = AT91_PIN_PD17,
        .enable_pin     = AT91_PIN_PB6,
-       .partition_info = nand_partitions,
+       .parts          = ek_nand_partition,
+       .num_parts      = ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -154,7 +149,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,