diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/kernel/io.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/kernel/io.c')
| -rw-r--r-- | arch/arm/kernel/io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c index 1f6822dfae74..f4470307edb8 100644 --- a/arch/arm/kernel/io.c +++ b/arch/arm/kernel/io.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 3 | 3 | #include <linux/io.h> | |
| 4 | #include <asm/io.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Copy data from IO memory space to "real" memory space. | 6 | * Copy data from IO memory space to "real" memory space. |