diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:57:21 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:57:21 +0100 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /lib/iomap.c | |
| parent | [POWERPC] 85xx: Don't write reserved values to MAS1[TSIZE] (diff) | |
| parent | [POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff) | |
| download | linux-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz linux-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip | |
Merge branch 'master' into 85xx
Diffstat (limited to 'lib/iomap.c')
| -rw-r--r-- | lib/iomap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/iomap.c b/lib/iomap.c index d6ccdd85df53..4d43f37c0154 100644 --- a/lib/iomap.c +++ b/lib/iomap.c @@ -4,8 +4,9 @@ * (C) Copyright 2004 Linus Torvalds */ #include <linux/pci.h> +#include <linux/io.h> + #include <linux/module.h> -#include <asm/io.h> /* * Read/write from/to an (offsettable) iomem cookie. It might be a PIO |