diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/powerpc/platforms/85xx | |
parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 124e2c595972..329fcd48669a 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -53,6 +53,7 @@ config MPC85xx | |||
53 | bool | 53 | bool |
54 | select PPC_UDBG_16550 | 54 | select PPC_UDBG_16550 |
55 | select PPC_INDIRECT_PCI | 55 | select PPC_INDIRECT_PCI |
56 | select SERIAL_8250_SHARE_IRQ if SERIAL_8250 | ||
56 | default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \ | 57 | default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \ |
57 | || MPC85xx_MDS || MPC8544_DS | 58 | || MPC85xx_MDS || MPC8544_DS |
58 | 59 | ||