diff options
| author | David Woodhouse | 2007-02-05 14:25:21 +0100 |
|---|---|---|
| committer | David Woodhouse | 2007-02-05 14:25:21 +0100 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /drivers/mtd | |
| parent | [MTD] ck804xrom: fix a pci_find_device (diff) | |
| parent | Linux 2.6.20 (diff) | |
| download | kernel-qcow2-linux-4285431fb658263e98942ce2320b0b26eddcc06d.tar.gz kernel-qcow2-linux-4285431fb658263e98942ce2320b0b26eddcc06d.tar.xz kernel-qcow2-linux-4285431fb658263e98942ce2320b0b26eddcc06d.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c index e1ee62a17fe0..1e877cbe7757 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 |