diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /drivers/mtd/nand | |
| parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
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 e1ee62a17fe0..1e877cbe7757 100644 --- a/drivers/mtd/nand/cafe.c +++ b/drivers/mtd/nand/cafe.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/dma-mapping.h> | ||
| 17 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 18 | 19 | ||
| 19 | #define CAFE_NAND_CTRL1 0x00 | 20 | #define CAFE_NAND_CTRL1 0x00 |