diff options
| author | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 12:30:36 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 12:30:36 -0500 |
| commit | 0f76ee451484d02c7405d92e7bceb39b415abb01 (patch) | |
| tree | 9722f84281f786ba48971dde057f5171a49969e4 /lib/iomap_copy.c | |
| parent | 01d206a7c1167639f6ca6dac22140fbdca017558 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'lib/iomap_copy.c')
| -rw-r--r-- | lib/iomap_copy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iomap_copy.c b/lib/iomap_copy.c index a6b1e271d53c..351045f4f63c 100644 --- a/lib/iomap_copy.c +++ b/lib/iomap_copy.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. | 15 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/io.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/io.h> | ||
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * __iowrite32_copy - copy data to MMIO space, in 32-bit units | 22 | * __iowrite32_copy - copy data to MMIO space, in 32-bit units |