diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 08:16:46 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 08:16:46 (GMT) |
| commit | a1a2ab2ff7040bdc9a31bfe7173913971f7d723b (patch) | |
| tree | a5b448aaedafafca6974710b7d64074ed964fe24 /drivers/bus/Kconfig | |
| parent | 00eb4bab69db349c3bdc7e0b0f7e9070dafea58c (diff) | |
| parent | 7379047d5585187d1288486d4627873170d0005a (diff) | |
| download | linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.xz | |
Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/bus/Kconfig')
| -rw-r--r-- | drivers/bus/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 1a82f3a..0ebca8b 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -36,7 +36,6 @@ config ARM_CCI400_PORT_CTRL config ARM_CCI500_PMU bool "ARM CCI500 PMU support" - default y depends on (ARM && CPU_V7) || ARM64 depends on PERF_EVENTS select ARM_CCI_PMU |