diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /arch/arm/mach-keystone/Kconfig | |
| parent | ad8686bc05adc2b8301d749f5958bd904f3a46ee (diff) | |
| parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'arch/arm/mach-keystone/Kconfig')
| -rw-r--r-- | arch/arm/mach-keystone/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index f50bc936cb84..98a156afaa94 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config ARCH_KEYSTONE | 1 | config ARCH_KEYSTONE |
| 2 | bool "Texas Instruments Keystone Devices" | 2 | bool "Texas Instruments Keystone Devices" |
| 3 | depends on ARCH_MULTI_V7 | 3 | depends on ARCH_MULTI_V7 |
| 4 | depends on ARM_PATCH_PHYS_VIRT | ||
| 4 | select ARM_GIC | 5 | select ARM_GIC |
| 5 | select HAVE_ARM_ARCH_TIMER | 6 | select HAVE_ARM_ARCH_TIMER |
| 6 | select CLKSRC_MMIO | 7 | select CLKSRC_MMIO |