diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /drivers/mtd | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 61c922a8356..ce5752ab579 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 23 | #include <asm/dma.h> | ||
| 24 | 23 | ||
| 24 | #include <mach/dma.h> | ||
| 25 | #include <mach/pxa-regs.h> | 25 | #include <mach/pxa-regs.h> |
| 26 | #include <mach/pxa3xx_nand.h> | 26 | #include <mach/pxa3xx_nand.h> |
| 27 | 27 | ||