]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linux-2.6' into for-2.6.22
authorPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)
1  2 
arch/powerpc/kernel/process.c
arch/powerpc/platforms/85xx/Kconfig
arch/powerpc/platforms/pasemi/iommu.c
drivers/net/Kconfig
drivers/video/Kconfig

Simple merge
index 124e2c595972fe16851e5dce9613ee26a89b5274,e764c0aced88ae6b3d7a752a6766dc6a6ef362c8..329fcd48669a9ab6d275b6334411618efb6cc26e
@@@ -53,8 -47,8 +53,9 @@@ config MPC85x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
 -      default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
+       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
Simple merge
Simple merge
Simple merge