diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-02 19:59:15 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-02 19:59:28 +0200 |
| commit | c2573077dfacebdf58f69c666e8f15e9528e5a12 (patch) | |
| tree | e2a6b24366a6b8d75e5b885d82ed25a11da35317 /arch/frv/Kconfig | |
| parent | irqchip: irq-gic: Fix checkpatch errors (diff) | |
| parent | irqchip: gic: Perform the gic_secondary_init() call via CPU notifier (diff) | |
| download | linux-c2573077dfacebdf58f69c666e8f15e9528e5a12.tar.xz linux-c2573077dfacebdf58f69c666e8f15e9528e5a12.zip | |
Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 into next/cleanup
* 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
irqchip: gic: Call handle_bad_irq() directly
arm: Move chained_irq_(enter|exit) to a generic file
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
+ Linux 3.9-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/frv/Kconfig')
| -rw-r--r-- | arch/frv/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 12369b194c7b..2ce731f9aa4d 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -6,7 +6,7 @@ config FRV select HAVE_PERF_EVENTS select HAVE_UID16 select HAVE_GENERIC_HARDIRQS - select HAVE_VIRT_TO_BUS + select VIRT_TO_BUS select GENERIC_IRQ_SHOW select HAVE_DEBUG_BUGVERBOSE select ARCH_HAVE_NMI_SAFE_CMPXCHG |