diff options
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index a9675d8d1822..797e8c6a4130 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -15,12 +15,13 @@ #include <linux/delay.h> #include <linux/gpio.h> #include <mach/hardware.h> -#include <plat/mmc.h> +#include <linux/platform_data/gpio-omap.h> + #include <plat/omap-pm.h> -#include <plat/mux.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "mux.h" +#include "mmc.h" #include "hsmmc.h" #include "control.h" @@ -522,7 +523,7 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id); od = omap_device_alloc(pdev, ohs, 1, NULL, 0); - if (!od) { + if (IS_ERR(od)) { pr_err("Could not allocate od for %s\n", name); goto put_pdev; } |