From: Paul Mackerras <paulus@samba.org>
Date: Thu, 13 Mar 2008 04:26:33 +0000 (+1100)
Subject: Merge branch 'linux-2.6'
X-Git-Tag: firefly_0821_release~21602^2~144
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bed04a4413376265746053be2a9cfbfc80c98ec9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-2.6'
---

bed04a4413376265746053be2a9cfbfc80c98ec9
diff --cc arch/powerpc/Kconfig
index e4e13e0bca16,1189d8d6170d..ef12db07b22f
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -90,7 -90,7 +90,8 @@@ config PP
  	select HAVE_IDE
  	select HAVE_OPROFILE
  	select HAVE_KPROBES
+ 	select HAVE_KRETPROBES
 +	select HAVE_LMB
  
  config EARLY_PRINTK
  	bool