From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:24:41 +0000 (+0100)
Subject: Merge branch 'cross-platform/debug_ll' into imx/imx6q
X-Git-Tag: v3.2-rc1~88^2^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ccfa8b21f20099b950b4f2f75d2330fb149a2012

Merge branch 'cross-platform/debug_ll' into imx/imx6q

Conflicts:
	arch/arm/Kconfig.debug
---

ccfa8b21f20099b950b4f2f75d2330fb149a2012
diff --cc arch/arm/Kconfig.debug
index 0887801c324f,5bc7814d9a3d..13c0631e6e95
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -146,22 -251,4 +251,10 @@@ config OC_ET
  	  buffer driver that will allow you to collect traces of the
  	  kernel code.
  
- config DEBUG_S3C_UART
- 	depends on PLAT_SAMSUNG
- 	int "S3C UART to use for low-level debug"
- 	default "0"
- 	help
- 	  Choice for UART for kernel low-level using S3C UARTS,
- 	  should be between zero and two. The port must have been
- 	  initialised by the boot-loader before use.
- 
- 	  The uncompressor code port configuration is now handled
- 	  by CONFIG_S3C_LOWLEVEL_UART_PORT.
- 
 +config ARM_KPROBES_TEST
 +	tristate "Kprobes test module"
 +	depends on KPROBES && MODULES
 +	help
 +	  Perform tests of kprobes API and instruction set simulation.
 +
  endmenu