Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[sfrench/cifs-2.6.git] / arch / sh / boards / mach-highlander / setup.c

diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index c5a40f7906d789b453ff9e8a4e1fc2961b345fc8..806438b42cacbf68f2748c7a1ed3c04a4df82a98 100644 (file)
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -294,6 +294,8 @@ static void __init highlander_setup(char **cmdline_p)
                         (ver >> 12) & 0xf, (ver >> 8) & 0xf,
                         (ver >>  4) & 0xf, ver & 0xf);
 
+       highlander_plat_pinmux_setup();
+
        /*
         * Enable the important clocks right away..
         */