diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 16:44:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 16:45:01 +0100 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /drivers/clocksource/cyclone.c | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/clocksource/cyclone.c')
| -rw-r--r-- | drivers/clocksource/cyclone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c index 1bde303b970b..8615059a8729 100644 --- a/drivers/clocksource/cyclone.c +++ b/drivers/clocksource/cyclone.c @@ -7,7 +7,7 @@ #include <asm/pgtable.h> #include <asm/io.h> -#include "mach_timer.h" +#include <asm/mach_timer.h> #define CYCLONE_CBAR_ADDR 0xFEB00CD0 /* base address ptr */ #define CYCLONE_PMCC_OFFSET 0x51A0 /* offset to control register */ |