aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa270.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-08-11 19:45:05 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-12-20 10:07:42 -0500
commita3172e5413a06af772c6ad34c0f68a2ebbdbcf86 (patch)
treeee5083eb5a0b81ffa2b9faddc2aab94d77e7bbc0 /arch/arm/mach-pxa/colibri-pxa270.c
parent072e1ae73c65496355279505de378b33c916e364 (diff)
ARM: pxa: Rename Colibri evalboard
Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with all Colibri modules. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa270.c')
-rw-r--r--arch/arm/mach-pxa/colibri-pxa270.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c
index eecbb8bc4533..6fc5d328ba7f 100644
--- a/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/arch/arm/mach-pxa/colibri-pxa270.c
@@ -35,7 +35,7 @@
35/****************************************************************************** 35/******************************************************************************
36 * Evaluation board MFP 36 * Evaluation board MFP
37 ******************************************************************************/ 37 ******************************************************************************/
38#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD 38#ifdef CONFIG_MACH_COLIBRI_EVALBOARD
39static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = { 39static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = {
40 /* MMC */ 40 /* MMC */
41 GPIO32_MMC_CLK, 41 GPIO32_MMC_CLK,
@@ -281,10 +281,10 @@ static void __init colibri_pxa270_init(void)
281 colibri_pxa270_tsc_init(); 281 colibri_pxa270_tsc_init();
282 282
283 switch (colibri_pxa270_baseboard) { 283 switch (colibri_pxa270_baseboard) {
284 case COLIBRI_PXA270_EVALBOARD: 284 case COLIBRI_EVALBOARD:
285 pxa2xx_mfp_config(ARRAY_AND_SIZE( 285 pxa2xx_mfp_config(ARRAY_AND_SIZE(
286 colibri_pxa270_evalboard_pin_config)); 286 colibri_pxa270_evalboard_pin_config));
287 colibri_pxa270_evalboard_init(); 287 colibri_evalboard_init();
288 break; 288 break;
289 case COLIBRI_PXA270_INCOME: 289 case COLIBRI_PXA270_INCOME:
290 pxa2xx_mfp_config(ARRAY_AND_SIZE(income_pin_config)); 290 pxa2xx_mfp_config(ARRAY_AND_SIZE(income_pin_config));