remove err when compile no fb

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 0be0d09cea0e1bb119dc41a794162f2a9381cbce..eb1cc3a63381728bb5f03b85ef54a81993a0cc87 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -117,17 +117,25 @@ struct rk29_nand_platform_data rk29_nand_data = {
     .io_init   = rk29_nand_io_init,
 };
 
+/*****************************************************************************************
+* touch screen devices
+* author: cf@rock-chips.com
+*****************************************************************************************/
+#define TOUCH_SCREEN_STANDBY_PIN          INVALID_GPIO
+#define TOUCH_SCREEN_STANDBY_VALUE        GPIO_HIGH
+#define TOUCH_SCREEN_DISPLAY_PIN          INVALID_GPIO
+#define TOUCH_SCREEN_DISPLAY_VALUE        GPIO_HIGH
+
 #ifdef CONFIG_FB_RK29
 /*****************************************************************************************
  * lcd  devices
  * author: zyw@rock-chips.com
  *****************************************************************************************/
-//#ifdef  CONFIG_LCD_TD043MGEA1
 #define LCD_TXD_PIN          INVALID_GPIO
 #define LCD_CLK_PIN          INVALID_GPIO
 #define LCD_CS_PIN           INVALID_GPIO
 /*****************************************************************************************
-* frame buffe  devices
+* frame buffer devices pin define
 * author: zyw@rock-chips.com
 *****************************************************************************************/
 #define FB_ID                       0
@@ -139,16 +147,6 @@ struct rk29_nand_platform_data rk29_nand_data = {
 #define FB_DISPLAY_ON_VALUE         GPIO_HIGH
 #define FB_LCD_STANDBY_VALUE        GPIO_HIGH
 
-//#endif
-/*****************************************************************************************
-* touch screen devices
-* author: cf@rock-chips.com
-*****************************************************************************************/
-#define TOUCH_SCREEN_STANDBY_PIN          INVALID_GPIO
-#define TOUCH_SCREEN_STANDBY_VALUE        GPIO_HIGH
-#define TOUCH_SCREEN_DISPLAY_PIN          INVALID_GPIO
-#define TOUCH_SCREEN_DISPLAY_VALUE        GPIO_HIGH
-
 static int rk29_lcd_io_init(void)
 {
     int ret = 0;

diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
index 19e534aca13b9a99fdfc554f27640e70c61fe668..7faf10e5a2c61527cd5cf0a819c92b5aaf82a764 100644 (file)
--- a/drivers/video/display/Kconfig
+++ b/drivers/video/display/Kconfig
@@ -6,6 +6,7 @@ menu "Display device support"
 
 config DISPLAY_SUPPORT
        tristate "Display panel/monitor support"
+       depends on FB_RK29
        ---help---
          This framework adds support for low-level control of a display.
          This includes support for power.

diff --git a/drivers/video/hdmi/Kconfig b/drivers/video/hdmi/Kconfig
index 26157f097bb32ace0deb90389ce8949c69c7202b..b62e7dacf3c09c0019860118415c16ecb8474bc1 100644 (file)
--- a/drivers/video/hdmi/Kconfig
+++ b/drivers/video/hdmi/Kconfig
@@ -4,7 +4,8 @@
 menu "HDMI"
 config HDMI
        tristate "HDMI support"
-
+    depends on FB_RK29
+    
 if HDMI
 
 config HDMI_OLD