Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / mach-ixp4xx / dsmg600-setup.c

diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 397190f3a8da6cdbc87a3fac2296f793a497cf8f..4d4c62fced714a81d3d16b4468f8eefcf1c67974 100644 (file)
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -35,6 +35,8 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/time.h>
 
+#include "irqs.h"
+
 #define DSMG600_SDA_PIN                5
 #define DSMG600_SCL_PIN                4
 
@@ -268,9 +270,6 @@ static void __init dsmg600_init(void)
 {
        ixp4xx_sys_init();
 
-       /* Make sure that GPIO14 and GPIO15 are not used as clocks */
-       *IXP4XX_GPIO_GPCLKR = 0;
-
        dsmg600_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        dsmg600_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;