Merge branch 'master' into gfs2

[pandora-kernel.git] / drivers / pci / pcie / portdrv.h

diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index a63bd8f..67fcd17 100644 (file)
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -29,7 +29,6 @@
 
 struct pcie_port_device_ext {
        int interrupt_mode;     /* [0:INTx | 1:MSI | 2:MSI-X] */
-       unsigned int saved_msi_config_space[5];
 };
 
 extern struct bus_type pcie_port_bus_type;
@@ -40,7 +39,7 @@ extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
 extern int pcie_port_device_resume(struct pci_dev *dev);
 #endif
 extern void pcie_port_device_remove(struct pci_dev *dev);
-extern void pcie_port_bus_register(void);
+extern int pcie_port_bus_register(void);
 extern void pcie_port_bus_unregister(void);
 
 #endif /* _PORTDRV_H_ */