diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 22:18:36 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 22:18:36 +0200 |
| commit | 6a7b3e970426f4bc2a8d52f81a4fda6595a9f052 (patch) | |
| tree | 055765564c839e456fbe4c65c8cd2c4b00d731b7 /arch/xtensa/Kconfig | |
| parent | 661462f4c6d3c9ae0bac193c65936ebfac4c95b4 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | linux-6a7b3e970426f4bc2a8d52f81a4fda6595a9f052.tar.bz2 | |
Merge tag 'v3.9-rc5' into devel
Linux 3.9-rc5
Conflicts:
drivers/pinctrl/pinconf.c
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 35876ffac11d..b09de49dbec5 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -9,7 +9,7 @@ config XTENSA select HAVE_IDE select GENERIC_ATOMIC64 select HAVE_GENERIC_HARDIRQS - select HAVE_VIRT_TO_BUS + select VIRT_TO_BUS select GENERIC_IRQ_SHOW select GENERIC_CPU_DEVICES select MODULES_USE_ELF_RELA |