diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 11:46:29 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 11:46:29 (GMT) |
| commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch) | |
| tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 /arch/arm/mach-clps711x/cdb89712.c | |
| parent | 4f962d4d65923d7b722192e729840cfb79af0a5a (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
| download | linux-fsl-qoriq-b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40.tar.xz | |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Diffstat (limited to 'arch/arm/mach-clps711x/cdb89712.c')
| -rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 831df00..71a80b5 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c @@ -22,9 +22,9 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/mm.h> +#include <linux/io.h> -#include <asm/hardware.h> -#include <asm/io.h> +#include <mach/hardware.h> #include <asm/pgtable.h> #include <asm/page.h> #include <asm/setup.h> |