diff options
| -rw-r--r-- | arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap5/sys_proto.h | 2 | ||||
| -rw-r--r-- | board/isee/igep00x0/igep00x0.c | 1 | ||||
| -rw-r--r-- | board/overo/overo.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap_elm.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap_gpmc.c | 2 | ||||
| -rw-r--r-- | include/linux/mtd/omap_gpmc.h (renamed from arch/arm/include/asm/omap_gpmc.h) | 0 |
9 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h index f73e285..91ff2ad 100644 --- a/arch/arm/include/asm/arch-am33xx/sys_proto.h +++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h @@ -10,7 +10,7 @@ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_ -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> #include <asm/arch/cpu.h> #define BOARD_REV_ID 0x0 diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 83d7f11..44fa66f 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -7,7 +7,7 @@ */ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_ -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> typedef struct { u32 mtype; diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index ea8b72c..b338a15 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -12,7 +12,7 @@ #include <asm/arch/clock.h> #include <asm/io.h> #include <asm/omap_common.h> -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> #include <asm/arch/mux_omap4.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h index 4247473..9e007c8 100644 --- a/arch/arm/include/asm/arch-omap5/sys_proto.h +++ b/arch/arm/include/asm/arch-omap5/sys_proto.h @@ -12,7 +12,7 @@ #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/omap_common.h> -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> #include <asm/arch/clock.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index 7a7500b..3b2b1f1 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -8,7 +8,6 @@ #include <twl4030.h> #include <netdev.h> #include <asm/gpio.h> -#include <asm/omap_gpmc.h> #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/mmc_host_def.h> diff --git a/board/overo/overo.c b/board/overo/overo.c index 9ac35d2..1192d02 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -21,7 +21,6 @@ #include <asm/arch/mux.h> #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h> -#include <asm/omap_gpmc.h> #include <asm/gpio.h> #include <asm/mach-types.h> #include "overo.h" diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c index 64dca4f..55a631d 100644 --- a/drivers/mtd/nand/omap_elm.c +++ b/drivers/mtd/nand/omap_elm.c @@ -16,7 +16,7 @@ #include <common.h> #include <asm/io.h> #include <asm/errno.h> -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> #include <asm/omap_elm.h> #include <asm/arch/hardware.h> diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c index b54e39e..452e40f 100644 --- a/drivers/mtd/nand/omap_gpmc.c +++ b/drivers/mtd/nand/omap_gpmc.c @@ -9,7 +9,7 @@ #include <asm/io.h> #include <asm/errno.h> #include <asm/arch/mem.h> -#include <asm/omap_gpmc.h> +#include <linux/mtd/omap_gpmc.h> #include <linux/mtd/nand_ecc.h> #include <linux/bch.h> #include <linux/compiler.h> diff --git a/arch/arm/include/asm/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index 22f6573..22f6573 100644 --- a/arch/arm/include/asm/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h |