Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / taishan.c

diff --git a/arch/ppc/platforms/4xx/taishan.c b/arch/ppc/platforms/4xx/taishan.c
index bb0253eef45ab0c19bd739e1e1ba3a478160317c..888c492b4a4535dea8730f56a42d52ad66f2cc4b 100644 (file)
--- a/arch/ppc/platforms/4xx/taishan.c
+++ b/arch/ppc/platforms/4xx/taishan.c
@@ -30,6 +30,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
@@ -235,7 +236,7 @@ taishan_setup_pcix(void)
        /* Setup 2GB PCI->PLB inbound memory window at 0, enable MSIs */
        PCIX_WRITEL(0x00000000, PCIX0_PIM0LAH);
        PCIX_WRITEL(0x00000000, PCIX0_PIM0LAL);
-       PCIX_WRITEL(0xe0000007, PCIX0_PIM0SA);
+       PCIX_WRITEL(0x80000007, PCIX0_PIM0SA);
        PCIX_WRITEL(0xffffffff, PCIX0_PIM0SAH);
 
        iounmap(pcix_reg_base);