diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /arch/arm/mach-clps711x/cdb89712.c | |
| parent | x86, pci: iommu fix potential overflow in alloc_iommu() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-f3efbe582b5396d134024c03a5fa253f2a85d9a6.tar.xz linux-f3efbe582b5396d134024c03a5fa253f2a85d9a6.zip | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'arch/arm/mach-clps711x/cdb89712.c')
| -rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 831df007f6c7..aa02aa5a01f4 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c @@ -23,7 +23,7 @@ #include <linux/string.h> #include <linux/mm.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/pgtable.h> #include <asm/page.h> |