aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:25 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:25 -0400
commit05adc3b7458e97a1d0180828000207a403083389 (patch)
treeb7ec16681719bfd3caac350a750b50ed5a4abf50 /drivers/net/irda
parent4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (diff)
[PATCH] u32 vs. pm_message_t fixes for drivers/net
This fixes remaining u32s in drivers/ net. 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/net/irda')
-rw-r--r--drivers/net/irda/sa1100_ir.c2
-rw-r--r--drivers/net/irda/vlsi_ir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 89f5096cab74..8d34ac60d906 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -291,7 +291,7 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
291/* 291/*
292 * Suspend the IrDA interface. 292 * Suspend the IrDA interface.
293 */ 293 */
294static int sa1100_irda_suspend(struct device *_dev, u32 state, u32 level) 294static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
295{ 295{
296 struct net_device *dev = dev_get_drvdata(_dev); 296 struct net_device *dev = dev_get_drvdata(_dev);
297 struct sa1100_irda *si; 297 struct sa1100_irda *si;
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 35fad8171a01..006e4f575606 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1744,7 +1744,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
1744 */ 1744 */
1745 1745
1746 1746
1747static int vlsi_irda_suspend(struct pci_dev *pdev, u32 state) 1747static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
1748{ 1748{
1749 struct net_device *ndev = pci_get_drvdata(pdev); 1749 struct net_device *ndev = pci_get_drvdata(pdev);
1750 vlsi_irda_dev_t *idev; 1750 vlsi_irda_dev_t *idev;