diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-30 19:57:12 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-30 19:57:12 +0300 |
| commit | 7a160df70c1e95c798e6424471f7b63cbf1532c6 (patch) | |
| tree | 6a3ceaab0cf0533722840775880b8a218b1fb894 /drivers/clocksource/arm_arch_timer.c | |
| parent | eecc87b23d1c5388c8fb7a183ef1e6f60d3cde8a (diff) | |
| parent | 9b4db147ac19c2320edec431d93193f42e32d425 (diff) | |
Automatically merging tracking-ilp32 into merge-linux-linaroll-20150430.0ll_20150430.0
Conflicting files:
arch/arm64/Kconfig
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 0aa135ddbf80..1a2f8adc6d12 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -311,7 +311,7 @@ static void arch_timer_evtstrm_enable(int divider) | ARCH_TIMER_VIRT_EVT_EN; arch_timer_set_cntkctl(cntkctl); elf_hwcap |= HWCAP_EVTSTRM; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM; #endif } |