diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 13:25:21 +0000 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 13:25:21 +0000 |
commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
tree | 49bce2d36917cb628ccddee55a47026da2ed90db /drivers/mtd/nand | |
parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
download | kernel_samsung_crespo-4285431fb658263e98942ce2320b0b26eddcc06d.zip kernel_samsung_crespo-4285431fb658263e98942ce2320b0b26eddcc06d.tar.gz kernel_samsung_crespo-4285431fb658263e98942ce2320b0b26eddcc06d.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/cafe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c index e1ee62a..1e877cb 100644 --- a/drivers/mtd/nand/cafe.c +++ b/drivers/mtd/nand/cafe.c @@ -14,6 +14,7 @@ #include <linux/pci.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #define CAFE_NAND_CTRL1 0x00 |