aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:33 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:33 -0400
commit7f4927c1b505eb4e679ab506bf7626af6258e6b6 (patch)
tree7686d23bf67956272967a79d7e3b23382ca17a3b /include/linux
parentf45139044db870835b53a0fea41da2e04c3958d0 (diff)
[PATCH] fix u32 vs. pm_message_t in PCI, PCIE
This fixes drivers/pci (mostly pcie stuff). Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pcieport_if.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index cd3eafc2c233..b44e01a70914 100644
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -59,7 +59,7 @@ struct pcie_port_service_driver {
59 int (*probe) (struct pcie_device *dev, 59 int (*probe) (struct pcie_device *dev,
60 const struct pcie_port_service_id *id); 60 const struct pcie_port_service_id *id);
61 void (*remove) (struct pcie_device *dev); 61 void (*remove) (struct pcie_device *dev);
62 int (*suspend) (struct pcie_device *dev, u32 state); 62 int (*suspend) (struct pcie_device *dev, pm_message_t state);
63 int (*resume) (struct pcie_device *dev); 63 int (*resume) (struct pcie_device *dev);
64 64
65 const struct pcie_port_service_id *id_table; 65 const struct pcie_port_service_id *id_table;