diff options
| author | James Morris <jmorris@namei.org> | 2008-08-11 09:22:10 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-11 09:22:10 +1000 |
| commit | 293f28d5b02efe4504d5976f6f5889458ed56539 (patch) | |
| tree | 5655ae44757574814408aad72170615a74904916 /arch/arm/mach-ixp23xx/core.c | |
| parent | ea40dc0e3240d1dc9743b7d92d0c53783b10c5e5 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'master' into next-creds
Conflicts:
arch/sparc64/kernel/sys_sparc32.c
fs/cifs/dir.c
fs/cifs/inode.c
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/arm/mach-ixp23xx/core.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index df16a4eac490..68b4ac5b2481 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c @@ -32,8 +32,7 @@ #include <asm/types.h> #include <asm/setup.h> #include <asm/memory.h> -#include <asm/hardware.h> -#include <asm/mach-types.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/system.h> #include <asm/tlbflush.h> |