Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f97bd9e5 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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
parents ff3b6278 867f900b

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -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