diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /arch/arm/common/uengine.c | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.xz kernel-crypto-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'arch/arm/common/uengine.c')
| -rw-r--r-- | arch/arm/common/uengine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index 117cab30bd3..7ecd3c0ab01 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c @@ -16,8 +16,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/string.h> -#include <asm/hardware.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/uengine.h> #include <asm/io.h> |