fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / platforms / prpmc750.c

diff --git a/arch/ppc/platforms/prpmc750.c b/arch/ppc/platforms/prpmc750.c
index a75553c..fcab513 100644 (file)
--- a/arch/ppc/platforms/prpmc750.c
+++ b/arch/ppc/platforms/prpmc750.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/prpmc750_setup.c
- *
  * Board setup routines for Motorola PrPMC750
  *
  * Author: Matt Porter <mporter@mvista.com>
@@ -11,7 +9,6 @@
  * or implied.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -24,11 +21,11 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/ide.h>
 #include <linux/root_dev.h>
 #include <linux/slab.h>
+#include <linux/serial_reg.h>
 
 #include <asm/byteorder.h>
 #include <asm/system.h>
@@ -109,7 +106,7 @@ static void __init prpmc750_pcibios_fixup(void)
         * resource subsystem doesn't fixup the
         * PCI mem resources on the CL5446.
         */
-       if ((dev = pci_find_device(PCI_VENDOR_ID_CIRRUS,
+       if ((dev = pci_get_device(PCI_VENDOR_ID_CIRRUS,
                                   PCI_DEVICE_ID_CIRRUS_5446, 0))) {
                dev->resource[0].start += PRPMC750_PCI_PHY_MEM_OFFSET;
                dev->resource[0].end += PRPMC750_PCI_PHY_MEM_OFFSET;
@@ -121,6 +118,7 @@ static void __init prpmc750_pcibios_fixup(void)
                outb(0x0f, 0x3c4);
                /* Set proper DRAM config */
                outb(0xdf, 0x3c5);
+               pci_dev_put(dev);
        }
 }
 
@@ -301,8 +299,8 @@ static void __init prpmc750_init_IRQ(void)
 static __inline__ void prpmc750_set_bat(void)
 {
        mb();
-       mtspr(DBAT1U, 0xf0001ffe);
-       mtspr(DBAT1L, 0xf000002a);
+       mtspr(SPRN_DBAT1U, 0xf0001ffe);
+       mtspr(SPRN_DBAT1L, 0xf000002a);
        mb();
 }