eukrea-baseboards: fix the merge in one file
authorEric Bénard <eric@eukrea.com>
Fri, 30 Jul 2010 20:58:40 +0000 (22:58 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 16 Aug 2010 11:30:35 +0000 (13:30 +0200)
commitec53fe3d655befce6420a1b8485af9b1145a0c90
treed129e03535f7fbc55ce5e9946d1043632dceb737
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73
eukrea-baseboards: fix the merge in one file

Last change I did made a big mess in function names and CONFIG names,
this patch fixes this so that the baseboard support is really built
when selected.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c
arch/arm/mach-mx25/mach-cpuimx25.c
arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
arch/arm/mach-mx3/mach-cpuimx35.c
arch/arm/plat-mxc/include/mach/eukrea-baseboards.h