diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-08-31 00:37:24 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-13 03:06:30 +0200 |
| commit | 4b25408f1f61c35b70a19a41053b5e5e3224e97f (patch) | |
| tree | 5444bab447039299d1e2ac6c6d69f9ac347c0858 /drivers/mtd | |
| parent | ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end (diff) | |
| download | linux-4b25408f1f61c35b70a19a41053b5e5e3224e97f.tar.xz linux-4b25408f1f61c35b70a19a41053b5e5e3224e97f.zip | |
ARM: OMAP: Move gpio.h to include/linux/platform_data
This way we can remove includes of plat/gpio.h which won't work
with the single zImage support.
Note that we also remove the cpu_class_is_omap2() check
in gpio-omap.c as the drivers should not call it as we need to
make it local to arch/arm/mach-omap2 for single zImage support.
While at it, arrange the related includes in the standard way.
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-mtd@lists.infradead.org
Cc: alsa-devel@alsa-project.org
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/ams-delta.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 861ca8f7e47d..78a524b49357 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c @@ -23,12 +23,16 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> + #include <asm/io.h> -#include <mach/hardware.h> #include <asm/sizes.h> -#include <linux/gpio.h> + #include <plat/board-ams-delta.h> +#include <mach/hardware.h> + /* * MTD structure for E3 (Delta) */ |