diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-01 13:12:36 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 15:15:01 -0400 |
| commit | 13792578c88961256dd30e3a5d3fa1ac1ec9a7e0 (patch) | |
| tree | f16b8bd1d8f4a77ef6041d086ab172f06bd05ad1 /drivers | |
| parent | 928841b1538df117658ec5977bcf336c27f7747b (diff) | |
| download | kernel_samsung_smdk4412-13792578c88961256dd30e3a5d3fa1ac1ec9a7e0.zip kernel_samsung_smdk4412-13792578c88961256dd30e3a5d3fa1ac1ec9a7e0.tar.gz kernel_samsung_smdk4412-13792578c88961256dd30e3a5d3fa1ac1ec9a7e0.tar.bz2 | |
p54usb: Fixes compile error with CONFIG_PM=n
/drivers/net/wireless/p54/p54usb.c: In function 'p54u_probe':
/drivers/net/wireless/p54/p54usb.c:923: error: 'struct usb_device' has no member named 'reset_resume'
In the struct usb_device the reset_resume attribute is only available
when CONFIG_PM is defined.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index ec6c954..f40c0f4 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -919,9 +919,11 @@ static int __devinit p54u_probe(struct usb_interface *intf, priv->common.open = p54u_open; priv->common.stop = p54u_stop; if (recognized_pipes < P54U_PIPE_NUMBER) { +#ifdef CONFIG_PM /* ISL3887 needs a full reset on resume */ udev->reset_resume = 1; err = p54u_device_reset(dev); +#endif priv->hw_type = P54U_3887; dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr); |