From: Paul Mackerras <paulus@samba.org>
Date: Thu, 12 Apr 2007 17:50:03 +0000 (+1000)
Subject: Merge branch 'linux-2.6' into for-2.6.22
X-Git-Tag: v2.6.22-rc1~1109^2~121
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e049d1ca3094f3d1d94617f456a9961202f96e3a;p=linux-2.6-omap-h63xx.git

Merge branch 'linux-2.6' into for-2.6.22
---

e049d1ca3094f3d1d94617f456a9961202f96e3a
diff --cc arch/powerpc/platforms/85xx/Kconfig
index 124e2c59597,e764c0aced8..329fcd48669
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@@ -53,8 -47,8 +53,9 @@@ config MPC85x
  	bool
  	select PPC_UDBG_16550
  	select PPC_INDIRECT_PCI
+ 	select SERIAL_8250_SHARE_IRQ if SERIAL_8250
 -	default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
 +	default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
 +		|| MPC85xx_MDS || MPC8544_DS
  
  config PPC_INDIRECT_PCI_BE
  	bool