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/unicore32/Kconfig | |
| parent | 8358f6242dd447a4f694c7bc949bbfc842ca5db1 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'arch/unicore32/Kconfig')
| -rw-r--r-- | arch/unicore32/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index dc50b157fc83..2943e3acdf0c 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig | |||
| @@ -9,7 +9,7 @@ config UNICORE32 | |||
| 9 | select GENERIC_ATOMIC64 | 9 | select GENERIC_ATOMIC64 |
| 10 | select HAVE_KERNEL_LZO | 10 | select HAVE_KERNEL_LZO |
| 11 | select HAVE_KERNEL_LZMA | 11 | select HAVE_KERNEL_LZMA |
| 12 | select HAVE_VIRT_TO_BUS | 12 | select VIRT_TO_BUS |
| 13 | select ARCH_HAVE_CUSTOM_GPIO_H | 13 | select ARCH_HAVE_CUSTOM_GPIO_H |
| 14 | select GENERIC_FIND_FIRST_BIT | 14 | select GENERIC_FIND_FIRST_BIT |
| 15 | select GENERIC_IRQ_PROBE | 15 | select GENERIC_IRQ_PROBE |