Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[pandora-kernel.git] / arch / sparc / kernel / pci_impl.h

diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h
index 0318682..6beb60d 100644 (file)
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
@@ -91,7 +91,7 @@ struct pci_pbm_info {
        char                            *name;
 
        /* OBP specific information. */
-       struct of_device                *op;
+       struct platform_device          *op;
        u64                             ino_bitmap;
 
        /* PBM I/O and Memory space resources. */
@@ -131,9 +131,9 @@ struct pci_pbm_info {
        void                            *msi_queues;
        unsigned long                   *msi_bitmap;
        unsigned int                    *msi_irq_table;
-       int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev,
+       int (*setup_msi_irq)(unsigned int *irq_p, struct pci_dev *pdev,
                             struct msi_desc *entry);
-       void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev);
+       void (*teardown_msi_irq)(unsigned int irq, struct pci_dev *pdev);
        const struct sparc64_msiq_ops   *msi_ops;
 #endif /* !(CONFIG_PCI_MSI) */