diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 19:07:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 19:07:34 -0400 |
| commit | 23a376f98c5dcfc392d47e8d1872884ff44e585d (patch) | |
| tree | dbe476151bbd6530369c40746f2ec2365f7b500a /arch/powerpc/Kconfig | |
| parent | 8358f6242dd447a4f694c7bc949bbfc842ca5db1 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b89d7eb730a2..80821512e9cc 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -98,7 +98,7 @@ config PPC | |||
| 98 | select HAVE_FUNCTION_GRAPH_TRACER | 98 | select HAVE_FUNCTION_GRAPH_TRACER |
| 99 | select SYSCTL_EXCEPTION_TRACE | 99 | select SYSCTL_EXCEPTION_TRACE |
| 100 | select ARCH_WANT_OPTIONAL_GPIOLIB | 100 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 101 | select HAVE_VIRT_TO_BUS if !PPC64 | 101 | select VIRT_TO_BUS if !PPC64 |
| 102 | select HAVE_IDE | 102 | select HAVE_IDE |
| 103 | select HAVE_IOREMAP_PROT | 103 | select HAVE_IOREMAP_PROT |
| 104 | select HAVE_EFFICIENT_UNALIGNED_ACCESS | 104 | select HAVE_EFFICIENT_UNALIGNED_ACCESS |