diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-26 09:21:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-26 09:21:05 +0100 |
| commit | c656d9ca48d3ef1a11449e892ce488ee0bb5a335 (patch) | |
| tree | 0c5598659b3e7f12864d203967d42ac3feb1142c /drivers/mtd/onenand | |
| parent | 71ab6b245fda6e7597a667a67cce0d26c3c7a14b (diff) | |
| parent | a73ad3331fdbf4191cf99b83ea9ac7082b6757ba (diff) | |
Merge branch 'x86/fpu' into x86/cleanups
Diffstat (limited to 'drivers/mtd/onenand')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index e39b21d3e16..a7e4d985f5e 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -32,19 +32,18 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/mach/flash.h> -#include <asm/arch/gpmc.h> -#include <asm/arch/onenand.h> -#include <asm/arch/gpio.h> -#include <asm/arch/pm.h> +#include <mach/gpmc.h> +#include <mach/onenand.h> +#include <mach/gpio.h> +#include <mach/pm.h> -#include <linux/dma-mapping.h> -#include <asm/dma-mapping.h> -#include <asm/arch/dma.h> +#include <mach/dma.h> -#include <asm/arch/board.h> +#include <mach/board.h> #define DRIVER_NAME "omap2-onenand" |