diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:33 -0400 |
commit | 7f4927c1b505eb4e679ab506bf7626af6258e6b6 (patch) | |
tree | 7686d23bf67956272967a79d7e3b23382ca17a3b /drivers/pci/pcie/portdrv_bus.c | |
parent | f45139044db870835b53a0fea41da2e04c3958d0 (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 'drivers/pci/pcie/portdrv_bus.c')
-rw-r--r-- | drivers/pci/pcie/portdrv_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c index 9a02f28ed05f..4037a3e568de 100644 --- a/drivers/pci/pcie/portdrv_bus.c +++ b/drivers/pci/pcie/portdrv_bus.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/pcieport_if.h> | 15 | #include <linux/pcieport_if.h> |
16 | 16 | ||
17 | static int pcie_port_bus_match(struct device *dev, struct device_driver *drv); | 17 | static int pcie_port_bus_match(struct device *dev, struct device_driver *drv); |
18 | static int pcie_port_bus_suspend(struct device *dev, u32 state); | 18 | static int pcie_port_bus_suspend(struct device *dev, pm_message_t state); |
19 | static int pcie_port_bus_resume(struct device *dev); | 19 | static int pcie_port_bus_resume(struct device *dev); |
20 | 20 | ||
21 | struct bus_type pcie_port_bus_type = { | 21 | struct bus_type pcie_port_bus_type = { |
@@ -46,7 +46,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) | |||
46 | return 1; | 46 | return 1; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int pcie_port_bus_suspend(struct device *dev, u32 state) | 49 | static int pcie_port_bus_suspend(struct device *dev, pm_message_t state) |
50 | { | 50 | { |
51 | struct pcie_device *pciedev; | 51 | struct pcie_device *pciedev; |
52 | struct pcie_port_service_driver *driver; | 52 | struct pcie_port_service_driver *driver; |