Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-mmp / flint.c

diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c
index bdeb6db4d49a1a143396abcaec6b7fe3552a2946..c4fd806b15b42ad282533587e54a8378eb514c3d 100644 (file)
--- a/arch/arm/mach-mmp/flint.c
+++ b/arch/arm/mach-mmp/flint.c
@@ -47,7 +47,7 @@ static unsigned long flint_pin_config[] __initdata = {
        GPIO113_SMC_RDY,
 
        /*Ethernet*/
-       GPIO155_GPIO155,
+       GPIO155_GPIO,
 
        /* DFI */
        GPIO168_DFI_D0,