diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /arch/arm/mach-ixp4xx/common.c | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 1e93dfee7543..5083f03e9b5e 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
| @@ -416,6 +416,7 @@ static struct clocksource clocksource_ixp4xx = { | |||
| 416 | }; | 416 | }; |
| 417 | 417 | ||
| 418 | unsigned long ixp4xx_timer_freq = FREQ; | 418 | unsigned long ixp4xx_timer_freq = FREQ; |
| 419 | EXPORT_SYMBOL(ixp4xx_timer_freq); | ||
| 419 | static int __init ixp4xx_clocksource_init(void) | 420 | static int __init ixp4xx_clocksource_init(void) |
| 420 | { | 421 | { |
| 421 | clocksource_ixp4xx.mult = | 422 | clocksource_ixp4xx.mult = |