From: Paul Mackerras <paulus@samba.org>
Date: Mon, 23 Apr 2007 22:42:11 +0000 (+1000)
Subject: Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc... 
X-Git-Tag: v2.6.22-rc1~1109^2~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=445c9b5507b9d09a2e9b0b4dbb16517708aa40e6;p=linux-2.6-omap-h63xx.git

Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22
---

445c9b5507b9d09a2e9b0b4dbb16517708aa40e6
diff --cc arch/powerpc/platforms/85xx/Kconfig
index 329fcd48669,c79ae86c49c..629926e01e9
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@@ -53,27 -51,7 +51,8 @@@ config MPC85x
  	bool
  	select PPC_UDBG_16550
  	select PPC_INDIRECT_PCI
+ 	select PPC_INDIRECT_PCI_BE
+ 	select MPIC
 +	select SERIAL_8250_SHARE_IRQ if SERIAL_8250
  	default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
  		|| MPC85xx_MDS || MPC8544_DS
- 
- config PPC_INDIRECT_PCI_BE
- 	bool
- 	depends on PPC_85xx
- 	default y
- 
- config MPIC
- 	bool
- 	default y
- 
- config CPM2
- 	bool
- 	depends on MPC8560
- 	default y
- 	help
- 	  The CPM2 (Communications Processor Module) is a coprocessor on
- 	  embedded CPUs made by Motorola.  Selecting this option means that
- 	  you wish to build a kernel for a machine with a CPM2 coprocessor
- 	  on it.
- 
- endmenu