From d85969e9d1dfa99001e34c53051a7023de005b50 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 21 Jul 2008 16:20:54 +0800 Subject: [PATCH] --- yaml --- r: 112423 b: refs/heads/master c: 4fa7c24e94b3f5bfb367bb847af3c3abd8cca3c0 h: refs/heads/master i: 112421: 764b3c490519c8ff0ca078c592acfff5028c5870 112419: d2113d523a18c9819c0db6d24fa1f414a834c374 112415: 4c12bac6c05faf22358af0f708e2052d2bc5fb5f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 4 ++-- trunk/arch/arm/mach-pxa/poodle.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 524a463a12bb..65b23e7284ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fec12a62d74dc93a36c9ce1c3bce9ba045e44846 +refs/heads/master: 4fa7c24e94b3f5bfb367bb847af3c3abd8cca3c0 diff --git a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h index 6c8e72238bfd..617cab2cc8d0 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h +++ b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h @@ -17,7 +17,7 @@ /* Crystal and Clock Signals */ #define GPIO10_RTCCLK MFP_CFG_OUT(GPIO10, AF1, DRIVE_LOW) -#define GPIO70_RTC_CLK MFP_CFG_OUT(GPIO70, AF1, DRIVE_LOW) +#define GPIO70_RTCCLK MFP_CFG_OUT(GPIO70, AF1, DRIVE_LOW) #define GPIO7_48MHz MFP_CFG_OUT(GPIO7, AF1, DRIVE_LOW) #define GPIO11_3_6MHz MFP_CFG_OUT(GPIO11, AF1, DRIVE_LOW) #define GPIO71_3_6MHz MFP_CFG_OUT(GPIO71, AF1, DRIVE_LOW) @@ -156,6 +156,6 @@ #define GPIO74_LCD_FCLK MFP_CFG_OUT(GPIO74, AF2, DRIVE_LOW) #define GPIO75_LCD_LCLK MFP_CFG_OUT(GPIO75, AF2, DRIVE_LOW) #define GPIO76_LCD_PCLK MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW) -#define GPIO77_LCD_ACBIAS MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW) +#define GPIO77_LCD_BIAS MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW) #endif /* __ASM_ARCH_MFP_PXA25X_H */ diff --git a/trunk/arch/arm/mach-pxa/poodle.c b/trunk/arch/arm/mach-pxa/poodle.c index bd3a70f47702..2e3bd8b1523b 100644 --- a/trunk/arch/arm/mach-pxa/poodle.c +++ b/trunk/arch/arm/mach-pxa/poodle.c @@ -109,7 +109,7 @@ static unsigned long poodle_pin_config[] __initdata = { GPIO74_LCD_FCLK, GPIO75_LCD_LCLK, GPIO76_LCD_PCLK, - GPIO77_LCD_ACBIAS, + GPIO77_LCD_BIAS, /* PC Card */ GPIO48_nPOE,