From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2012 02:28:12 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=356b95424cfb456e14a59eaa579422ce014c424b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
  m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
  m68k/serial: Remove references to obsolete serial config options
  m68k/net: Remove obsolete IRQ_FLG_* users
  m68k: Don't comment out syscalls used by glibc
  m68k/atari: Move declaration of atari_SCC_reset_done to header file
  m68k/serial: Remove references to obsolete CONFIG_SERIAL167
  m68k/hp300: Export hp300_ledstate
  m68k: Initconst section fixes
  m68k/mac: cleanup macro case
  mac_scsi: fix mac_scsi on some powerbooks
  m68k/mac: fix powerbook 150 adb_type
  m68k/mac: fix baboon irq disable and shutdown
  m68k/mac: oss irq fixes
  m68k/mac: fix nubus slot irq disable and shutdown
  m68k/mac: enable via_alt_mapping on performa 580
  m68k/mac: cleanup forward declarations
  m68k/mac: cleanup mac_irq_pending
  m68k/mac: cleanup mac_clear_irq
  m68k/mac: early console
  m68k/mvme16x: Add support for EARLY_PRINTK
  ...

Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
EARLY_PRINTK config option addition clashing with movement of the
BOOTPARAM options.
---

356b95424cfb456e14a59eaa579422ce014c424b
diff --cc arch/m68k/Kconfig.debug
index af4fd5f8f8d5,a0c8863bd08b..87233acef18b
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,14 -2,17 +2,25 @@@ menu "Kernel hacking
  
  source "lib/Kconfig.debug"
  
 +config BOOTPARAM
 +	bool 'Compiled-in Kernel Boot Parameter'
 +
 +config BOOTPARAM_STRING
 +	string 'Kernel Boot Parameter'
 +	default 'console=ttyS0,19200'
 +	depends on BOOTPARAM
 +
+ 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.
+ 
  if !MMU
  
  config FULLDEBUG