diff --git a/[refs] b/[refs]
index 2a204d65d52a..82bb01a07603 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7738231f98578c8cd5b367441b4aa79ce864856f
+refs/heads/master: 8a7130404948b966e98b1285e777972b4b3f2fa2
diff --git a/trunk/drivers/net/wireless/ath/ar9170/usb.c b/trunk/drivers/net/wireless/ath/ar9170/usb.c
index d7b562dcebd2..d7c13c0177ca 100644
--- a/trunk/drivers/net/wireless/ath/ar9170/usb.c
+++ b/trunk/drivers/net/wireless/ath/ar9170/usb.c
@@ -689,7 +689,9 @@ static int ar9170_usb_probe(struct usb_interface *intf,
 	aru->common.exec_cmd = ar9170_usb_exec_cmd;
 	aru->common.callback_cmd = ar9170_usb_callback_cmd;
 
+#ifdef CONFIG_PM
 	udev->reset_resume = 1;
+#endif
 	err = ar9170_usb_reset(aru);
 	if (err)
 		goto err_freehw;