Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

This commit is contained in:
蓝斌元
2013-03-06 18:15:57 +08:00

View File

@@ -425,7 +425,7 @@ static struct sensor_platform_data cm3217_info = {
#ifdef CONFIG_FB_ROCKCHIP
#define LCD_CS_PIN INVALID_GPIO
#define LCD_CS_PIN RK30_PIN3_PD4//INVALID_GPIO
#define LCD_CS_VALUE GPIO_HIGH
#define LCD_EN_PIN RK30_PIN0_PB0