Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...

[pandora-kernel.git] / arch / arm / mach-u300 / mmc.c

diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c
index d9a5c92..4d482aa 100644 (file)
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@ -21,7 +21,6 @@
 #include <mach/gpio-u300.h>
 
 #include "mmc.h"
-#include "padmux.h"
 
 static struct mmci_platform_data mmc0_plat_data = {
        /*
@@ -45,24 +44,9 @@ static struct mmci_platform_data mmc0_plat_data = {
 int __devinit mmc_init(struct amba_device *adev)
 {
        struct device *mmcsd_device = &adev->dev;
-       struct pmx *pmx;
        int ret = 0;
 
        mmcsd_device->platform_data = &mmc0_plat_data;
 
-       /*
-        * Setup padmuxing for MMC. Since this must always be
-        * compiled into the kernel, pmx is never released.
-        */
-       pmx = pmx_get(mmcsd_device, U300_APP_PMX_MMC_SETTING);
-
-       if (IS_ERR(pmx))
-               pr_warning("Could not get padmux handle\n");
-       else {
-               ret = pmx_activate(mmcsd_device, pmx);
-               if (IS_ERR_VALUE(ret))
-                       pr_warning("Could not activate padmuxing\n");
-       }
-
        return ret;
 }