diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
| commit | b01bc4c8107f2a003b69a2ca03b925a57c13b28b (patch) | |
| tree | 61cc350679a0380d147ddf71b98a3b85f2442cba /arch/arm/boards | |
| parent | 9b1d12fff0650706eb3c335d31bd378b5d873cb2 (diff) | |
| parent | ffc25a119565d1a8588da6a27b4f6627ea5022ae (diff) | |
| download | barebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.gz barebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.xz | |
Merge branch 'for-next/randconfig-1'
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/edb93xx/edb93xx.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/friendlyarm-mini2440/mini2440.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index d83980d933..c314320d21 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -45,7 +45,7 @@ static int ep93xx_mem_init(void) #endif #if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4) arm_add_mem_device("ram3", CONFIG_EP93XX_SDRAM_BANK3_BASE, - CONFIG_EP93XX_SDRAM_BANK2_SIZE); + CONFIG_EP93XX_SDRAM_BANK3_SIZE); #endif return 0; diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index 4034de5a52..2dcb7db4db 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -96,7 +96,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = { .pixclock = 41848, .sync = FB_SYNC_USE_PWREN | FB_SYNC_DE_HIGH_ACT, .vmode = FB_VMODE_NONINTERLACED, - .flag = 0, }, #endif #ifdef CONFIG_MINI2440_VIDEO_SVGA @@ -115,7 +114,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = { .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_DE_HIGH_ACT /* | FB_SYNC_SWAP_HW */ /* FIXME maybe */ , .vmode = FB_VMODE_NONINTERLACED, - .flag = 0, }, #endif }; |