diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:31:48 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:31:48 +0200 |
| commit | bbf2abc0f5a5be0b8081ae8587fa90b376160444 (patch) | |
| tree | 3bbade787e2f3b791118990bb716cb962b386566 /board/davedenx/aria/aria.c | |
| parent | dd09985499ac95484974eb0f832fe47b33369952 (diff) | |
| parent | cdfcedbf250ba2ec01b2555cffde83e9947e9fbf (diff) | |
| download | u-boot-imx-bbf2abc0f5a5be0b8081ae8587fa90b376160444.zip u-boot-imx-bbf2abc0f5a5be0b8081ae8587fa90b376160444.tar.gz u-boot-imx-bbf2abc0f5a5be0b8081ae8587fa90b376160444.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-video
Diffstat (limited to 'board/davedenx/aria/aria.c')
| -rw-r--r-- | board/davedenx/aria/aria.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c index f17df60..31b079b 100644 --- a/board/davedenx/aria/aria.c +++ b/board/davedenx/aria/aria.c @@ -119,11 +119,6 @@ int misc_init_r(void) tmp & 0x000000FF ); -#ifdef CONFIG_FSL_DIU_FB -# if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)) - mpc5121_diu_init(); -# endif -#endif return 0; } |