aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa300.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-pxa300.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-pxa300.c')
-rw-r--r--arch/arm/mach-pxa/colibri-pxa300.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index 9b8d72de294c..b5bb248ffb8e 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -32,7 +32,7 @@
32#include "devices.h" 32#include "devices.h"
33 33
34 34
35#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD 35#ifdef CONFIG_MACH_COLIBRI_EVALBOARD
36static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = { 36static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
37 /* MMC */ 37 /* MMC */
38 GPIO7_MMC1_CLK, 38 GPIO7_MMC1_CLK,
@@ -173,7 +173,7 @@ void __init colibri_pxa300_init(void)
173 173
174 /* Evalboard init */ 174 /* Evalboard init */
175 pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_evalboard_pin_config)); 175 pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_evalboard_pin_config));
176 colibri_pxa270_evalboard_init(); 176 colibri_evalboard_init();
177} 177}
178 178
179MACHINE_START(COLIBRI300, "Toradex Colibri PXA300") 179MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")