From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Nov 2011 01:38:31 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20111124~75
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=048fe607c2a2bc1cc3458427ecef41fe52cb49c9;p=karo-tx-linux.git

Merge remote-tracking branch 'm68knommu/for-next'

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

048fe607c2a2bc1cc3458427ecef41fe52cb49c9
diff --cc arch/m68k/Kconfig.debug
index a0c8863bd08b,af4fd5f8f8d5..9d4008fee6d8
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,17 -2,14 +2,25 @@@ menu "Kernel hacking
  
  source "lib/Kconfig.debug"
  
 +config EARLY_PRINTK
 +	bool "Early printk" if EMBEDDED
 +	depends on MVME16x || MAC
 +	default y
 +	help
 +          Write kernel log output directly to a serial port.
 +
 +          This is useful for kernel debugging when your machine crashes very
 +          early before the console code is initialized.
 +          You should normally say N here, unless you want to debug such a crash.
 +
+ config BOOTPARAM
+ 	bool 'Compiled-in Kernel Boot Parameter'
+ 
+ config BOOTPARAM_STRING
+ 	string 'Kernel Boot Parameter'
+ 	default 'console=ttyS0,19200'
+ 	depends on BOOTPARAM
+ 
  if !MMU
  
  config FULLDEBUG