diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-22 00:07:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-22 00:07:34 +0100 |
| commit | 23a376f98c5dcfc392d47e8d1872884ff44e585d (patch) | |
| tree | dbe476151bbd6530369c40746f2ec2365f7b500a /arch/ia64 | |
| parent | driver: tty: vt: remove cast for kmalloc return value (diff) | |
| parent | Linux 3.9-rc3 (diff) | |
| download | linux-23a376f98c5dcfc392d47e8d1872884ff44e585d.tar.xz linux-23a376f98c5dcfc392d47e8d1872884ff44e585d.zip | |
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 33f3fdc0b214..9a02f71c6b1f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -26,7 +26,7 @@ config IA64 select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_VIRT_CPU_ACCOUNTING - select HAVE_VIRT_TO_BUS + select VIRT_TO_BUS select ARCH_DISCARD_MEMBLOCK select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP |