diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 16:21:47 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 16:21:47 -0700 |
commit | cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 (patch) | |
tree | 945afa7596fcdc4d960812dee1812c187d282bff /arch/s390/Kconfig | |
parent | 3f3b55bf7833d81d00c793d722e2af58d3b12963 (diff) | |
parent | d714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff) | |
download | linux-next-cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63.tar.gz |
Merge branch 'usb-linus' into usb-next
This is to pick up the fixes in that branch, and let Alan fix the merge
error in drivers/usb/host/ehci-timer.c better than I just did (as I know
I messed it up...)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 4b505370a1d5..eb8fb629f00b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -134,7 +134,7 @@ config S390 select HAVE_SYSCALL_WRAPPERS select HAVE_UID16 if 32BIT select HAVE_VIRT_CPU_ACCOUNTING - select HAVE_VIRT_TO_BUS + select VIRT_TO_BUS select INIT_ALL_POSSIBLE select KTIME_SCALAR if 32BIT select MODULES_USE_ELF_RELA |