aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-02-05 13:25:21 +0000
committerDavid Woodhouse <dwmw2@infradead.org>2007-02-05 13:25:21 +0000
commit4285431fb658263e98942ce2320b0b26eddcc06d (patch)
tree49bce2d36917cb628ccddee55a47026da2ed90db /drivers/mtd
parentc033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff)
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/cafe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c
index e1ee62a17fe..1e877cbe775 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