diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:25 -0700 |
| commit | 05adc3b7458e97a1d0180828000207a403083389 (patch) | |
| tree | b7ec16681719bfd3caac350a750b50ed5a4abf50 /drivers/net/typhoon.c | |
| parent | 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (diff) | |
| download | blackbird-op-linux-05adc3b7458e97a1d0180828000207a403083389.tar.gz blackbird-op-linux-05adc3b7458e97a1d0180828000207a403083389.zip | |
[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/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index b0d337f7f545..8f3392989a06 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -1906,7 +1906,7 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events) */ netif_carrier_off(tp->dev); - pci_enable_wake(tp->pdev, state, 1); + pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1); pci_disable_device(pdev); return pci_set_power_state(pdev, pci_choose_state(pdev, state)); } @@ -2287,7 +2287,7 @@ need_resume: } static int -typhoon_enable_wake(struct pci_dev *pdev, u32 state, int enable) +typhoon_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable) { return pci_enable_wake(pdev, state, enable); } |
