aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa320.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-pxa320.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-pxa320.c')
-rw-r--r--arch/arm/mach-pxa/colibri-pxa320.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c
index 0d8faf85a508..3d2c944b16e3 100644
--- a/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/arch/arm/mach-pxa/colibri-pxa320.c
@@ -35,7 +35,7 @@
35#include "generic.h" 35#include "generic.h"
36#include "devices.h" 36#include "devices.h"
37 37
38#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD 38#ifdef CONFIG_MACH_COLIBRI_EVALBOARD
39static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = { 39static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = {
40 /* MMC */ 40 /* MMC */
41 GPIO22_MMC1_CLK, 41 GPIO22_MMC1_CLK,
@@ -229,7 +229,7 @@ void __init colibri_pxa320_init(void)
229 229
230 /* Evalboard init */ 230 /* Evalboard init */
231 pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_evalboard_pin_config)); 231 pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_evalboard_pin_config));
232 colibri_pxa270_evalboard_init(); 232 colibri_evalboard_init();
233} 233}
234 234
235MACHINE_START(COLIBRI320, "Toradex Colibri PXA320") 235MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")