diff --git a/[refs] b/[refs] index 409a0b11b120..69e01dec0d07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db94a2f4dcfb2978545a3810b343abf198f92111 +refs/heads/master: 187749bb7c20a78cbce04f63e9e7a1e67d9d9c46 diff --git a/trunk/arch/arm/mach-s5pv210/mach-aquila.c b/trunk/arch/arm/mach-s5pv210/mach-aquila.c index 5c470dce2669..e41266419a3f 100644 --- a/trunk/arch/arm/mach-s5pv210/mach-aquila.c +++ b/trunk/arch/arm/mach-s5pv210/mach-aquila.c @@ -35,6 +35,7 @@ #include #include #include +#include #include /* Following are default values for UCON, ULCON and UFCON UART registers */ @@ -503,6 +504,10 @@ static void __init aquila_machine_init(void) /* SDHCI */ aquila_setup_sdhci(); + s3c_fimc_setname(0, "s5p-fimc"); + s3c_fimc_setname(1, "s5p-fimc"); + s3c_fimc_setname(2, "s5p-fimc"); + /* FB */ s3c_fb_set_platdata(&aquila_lcd_pdata);