diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-17 02:25:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 02:25:25 +0400 |
| commit | 05adc3b7458e97a1d0180828000207a403083389 (patch) | |
| tree | b7ec16681719bfd3caac350a750b50ed5a4abf50 /drivers/net/tulip | |
| parent | 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (diff) | |
| download | linux-05adc3b7458e97a1d0180828000207a403083389.tar.xz | |
[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/tulip')
| -rw-r--r-- | drivers/net/tulip/de2104x.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/xircom_tulip_cb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 008e19210e66..dd357dd8c370 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -2102,7 +2102,7 @@ static void __exit de_remove_one (struct pci_dev *pdev) #ifdef CONFIG_PM -static int de_suspend (struct pci_dev *pdev, u32 state) +static int de_suspend (struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata (pdev); struct de_private *de = dev->priv; diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index f7e64ee11b1d..caff2f590165 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -1620,7 +1620,7 @@ static void __devexit w840_remove1 (struct pci_dev *pdev) * Detach must occur under spin_unlock_irq(), interrupts from a detached * device would cause an irq storm. */ -static int w840_suspend (struct pci_dev *pdev, u32 state) +static int w840_suspend (struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata (pdev); struct netdev_private *np = netdev_priv(dev); diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c index 32ccb26890c3..b8a9b395c5ea 100644 --- a/drivers/net/tulip/xircom_tulip_cb.c +++ b/drivers/net/tulip/xircom_tulip_cb.c @@ -1655,7 +1655,7 @@ MODULE_DEVICE_TABLE(pci, xircom_pci_table); #ifdef CONFIG_PM -static int xircom_suspend(struct pci_dev *pdev, u32 state) +static int xircom_suspend(struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pdev); struct xircom_private *tp = netdev_priv(dev); |