diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/arm/mach-orion5x/include/mach/timex.h | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach/timex.h')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/timex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/timex.h b/arch/arm/mach-orion5x/include/mach/timex.h index e82e44db7629..4c69820e0810 100644 --- a/arch/arm/mach-orion5x/include/mach/timex.h +++ b/arch/arm/mach-orion5x/include/mach/timex.h | |||
| @@ -9,5 +9,3 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #define CLOCK_TICK_RATE (100 * HZ) | 11 | #define CLOCK_TICK_RATE (100 * HZ) |
| 12 | |||
| 13 | #define ORION5X_TCLK 166666667 | ||