diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-19 14:29:08 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-19 14:29:08 -0700 |
| commit | f97bd9e5fccad66301a486309aba96e4188a9310 (patch) | |
| tree | 1b21dead6a8e3c230bc1342e1e50070d2a534567 | |
| parent | ff3b6278edacc846fa63191f9f7ba10171160f61 (diff) | |
| parent | 867f900b43f8d571962b4a47035a0af9ebf84461 (diff) | |
Merge branch 'v3.18/topic/coresight' into linux-linaro-lsk-v3.18
* v3.18/topic/coresight:
ARM: Kconfig.debug: OC_ETM and CORESIGHT are mutually exclusive
| -rw-r--r-- | arch/arm/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 96651f74d6f6..21c031fe76d8 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1299,7 +1299,7 @@ config EARLY_PRINTK config OC_ETM bool "On-chip ETM and ETB" - depends on ARM_AMBA + depends on ARM_AMBA && !CORESIGHT help Enables the on-chip embedded trace macrocell and embedded trace buffer driver that will allow you to collect traces of the |