diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 15:54:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 15:54:49 -0500 |
| commit | d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4 (patch) | |
| tree | 86b2f8f1d22b74b05239525c55bd42e3db6afc03 /drivers/mtd/onenand | |
| parent | 343e9099c8152daff20e10d6269edec21da44fc0 (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/mtd/onenand')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 8387e05daae2..a7e4d985f5ef 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -32,20 +32,18 @@ | |||
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/dma-mapping.h> | ||
| 36 | #include <linux/io.h> | ||
| 35 | 37 | ||
| 36 | #include <asm/io.h> | ||
| 37 | #include <asm/mach/flash.h> | 38 | #include <asm/mach/flash.h> |
| 38 | #include <asm/arch/gpmc.h> | 39 | #include <mach/gpmc.h> |
| 39 | #include <asm/arch/onenand.h> | 40 | #include <mach/onenand.h> |
| 40 | #include <asm/arch/gpio.h> | 41 | #include <mach/gpio.h> |
| 41 | #include <asm/arch/gpmc.h> | 42 | #include <mach/pm.h> |
| 42 | #include <asm/arch/pm.h> | ||
| 43 | 43 | ||
| 44 | #include <linux/dma-mapping.h> | 44 | #include <mach/dma.h> |
| 45 | #include <asm/dma-mapping.h> | ||
| 46 | #include <asm/arch/dma.h> | ||
| 47 | 45 | ||
| 48 | #include <asm/arch/board.h> | 46 | #include <mach/board.h> |
| 49 | 47 | ||
| 50 | #define DRIVER_NAME "omap2-onenand" | 48 | #define DRIVER_NAME "omap2-onenand" |
| 51 | 49 | ||