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: v2.6.26-rc1~1125^2~144
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bed04a4413376265746053be2a9cfbfc80c98ec9;p=linux-2.6-omap-h63xx.git

Merge branch 'linux-2.6'
---

bed04a4413376265746053be2a9cfbfc80c98ec9
diff --cc arch/powerpc/Kconfig
index e4e13e0bca1,1189d8d6170..ef12db07b22
--- 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