Merge git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pseries / pci.c

diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 999a9620b5ce0f13f89cc08a8d75895ca46cad97..410a6bcc4ca008b9444e92ed567d9f29ac487577 100644 (file)
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc64/kernel/pSeries_pci.c
- *
  * Copyright (C) 2001 Dave Engebretsen, IBM Corporation
  * Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
  *
@@ -62,7 +60,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
 static void __devinit check_s7a(void)
 {
        struct device_node *root;
-       char *model;
+       const char *model;
 
        s7a_workaround = 0;
        root = of_find_node_by_path("/");
@@ -122,7 +120,7 @@ static void fixup_winbond_82c105(struct pci_dev* dev)
        int i;
        unsigned int reg;
 
-       if (!platform_is_pseries())
+       if (!machine_is(pseries))
                return;
 
        printk("Using INTC for W82c105 IDE controller.\n");