board LR097,rk3168 tb,ds1006h:lcdc device name rk30-lcdc

diff --git a/arch/arm/mach-rk30/board-rk3168-LR097.c b/arch/arm/mach-rk30/board-rk3168-LR097.c
index 699c327015fc1f29f56a7ee11bb85d4ee2f28d48..9582bbdef6a84b00a48a72f3431f3179eb198eee 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-LR097.c
+++ b/arch/arm/mach-rk30/board-rk3168-LR097.c
@@ -622,11 +622,7 @@ static struct resource resource_lcdc0[] = {
 };
 
 static struct platform_device device_lcdc0 = {
-#ifdef CONFIG_LCDC0_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 0,
        .num_resources    = ARRAY_SIZE(resource_lcdc0),
        .resource         = resource_lcdc0,
@@ -652,11 +648,7 @@ static struct resource resource_lcdc1[] = {
 };
 
 static struct platform_device device_lcdc1 = {
-#ifdef CONFIG_LCDC1_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 1,
        .num_resources    = ARRAY_SIZE(resource_lcdc1),
        .resource         = resource_lcdc1,

diff --git a/arch/arm/mach-rk30/board-rk3168-tb.c b/arch/arm/mach-rk30/board-rk3168-tb.c
index 064c777c7286f5433c1f9d6c7a004976e9167f6b..a67c0e00feeb34cdc4e01eac7abc427fb5834c41 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168-tb.c
@@ -582,11 +582,7 @@ static struct resource resource_lcdc0[] = {
 };
 
 static struct platform_device device_lcdc0 = {
-#ifdef CONFIG_LCDC0_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 0,
        .num_resources    = ARRAY_SIZE(resource_lcdc0),
        .resource         = resource_lcdc0,
@@ -612,11 +608,7 @@ static struct resource resource_lcdc1[] = {
 };
 
 static struct platform_device device_lcdc1 = {
-#ifdef CONFIG_LCDC1_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 1,
        .num_resources    = ARRAY_SIZE(resource_lcdc1),
        .resource         = resource_lcdc1,

diff --git a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
index 423386ce8643736d8fd98592eceeef150c110d27..d8c46075dc50c200f590dd0de5f4865de46fc018 100644 (file)
--- a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
+++ b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
@@ -457,11 +457,7 @@ static struct resource resource_lcdc0[] = {
 };
 
 static struct platform_device device_lcdc0 = {
-#ifdef CONFIG_LCDC0_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 0,
        .num_resources    = ARRAY_SIZE(resource_lcdc0),
        .resource         = resource_lcdc0,
@@ -487,11 +483,7 @@ static struct resource resource_lcdc1[] = {
 };
 
 static struct platform_device device_lcdc1 = {
-#ifdef CONFIG_LCDC1_RK3188
-       .name             = "rk3188-lcdc",
-#else
        .name             = "rk30-lcdc",
-#endif
        .id               = 1,
        .num_resources    = ARRAY_SIZE(resource_lcdc1),
        .resource         = resource_lcdc1,