From b7308a417a23969cfe3bc0360b3f224875e2b18b Mon Sep 17 00:00:00 2001 From: yxj Date: Sat, 8 Sep 2012 17:17:39 +0800 Subject: [PATCH] board rk3066 M701: rename lcdc config for rk3066b --- arch/arm/mach-rk30/board-rk3066b-m701.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rk30/board-rk3066b-m701.c b/arch/arm/mach-rk30/board-rk3066b-m701.c index b7965198dbe1..e0312288b9c0 100644 --- a/arch/arm/mach-rk30/board-rk3066b-m701.c +++ b/arch/arm/mach-rk30/board-rk3066b-m701.c @@ -644,7 +644,7 @@ static int rk_fb_io_enable(void) return 0; } -#if defined(CONFIG_LCDC0_RK31) +#if defined(CONFIG_LCDC0_RK3066B) struct rk29fb_info lcdc0_screen_info = { .prop = PRMRY, //primary display device .io_init = rk_fb_io_init, @@ -654,7 +654,7 @@ struct rk29fb_info lcdc0_screen_info = { }; #endif -#if defined(CONFIG_LCDC1_RK31) +#if defined(CONFIG_LCDC1_RK3066B) struct rk29fb_info lcdc1_screen_info = { #if defined(CONFIG_HDMI_RK30) .prop = EXTEND, //extend display device @@ -693,7 +693,7 @@ static struct platform_device device_fb = { }; #endif -#if defined(CONFIG_LCDC0_RK31) +#if defined(CONFIG_LCDC0_RK3066B) static struct resource resource_lcdc0[] = { [0] = { .name = "lcdc0 reg", @@ -720,7 +720,7 @@ static struct platform_device device_lcdc0 = { }, }; #endif -#if defined(CONFIG_LCDC1_RK31) +#if defined(CONFIG_LCDC1_RK3066B) static struct resource resource_lcdc1[] = { [0] = { .name = "lcdc1 reg", @@ -1170,10 +1170,10 @@ static struct platform_device *devices[] __initdata = { #ifdef CONFIG_FB_ROCKCHIP &device_fb, #endif -#if defined(CONFIG_LCDC0_RK31) +#if defined(CONFIG_LCDC0_RK3066B) &device_lcdc0, #endif -#if defined(CONFIG_LCDC1_RK31) +#if defined(CONFIG_LCDC1_RK3066B) &device_lcdc1, #endif -- 2.34.1