diff --git a/[refs] b/[refs]
index adace4a6d071..3fe2d6a07ad3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e882335bb19c0b9f96971fa6b1fe6c019280056b
+refs/heads/master: bbff696edead56dd87e1d10593ff0b438d29fbc5
diff --git a/trunk/drivers/staging/at76_usb/at76_usb.c b/trunk/drivers/staging/at76_usb/at76_usb.c
index c165c50c0119..97aef78d42f0 100644
--- a/trunk/drivers/staging/at76_usb/at76_usb.c
+++ b/trunk/drivers/staging/at76_usb/at76_usb.c
@@ -5319,10 +5319,12 @@ static int at76_init_new_device(struct at76_priv *priv,
 
 	/* Add pointers to enable iwspy support. */
 	priv->wireless_data.spy_data = &priv->spy_data;
+#ifdef CONFIG_WIRELESS_EXT
 	netdev->wireless_data = &priv->wireless_data;
+	netdev->wireless_handlers = &at76_handler_def;
+#endif
 
 	netdev->watchdog_timeo = 2 * HZ;
-	netdev->wireless_handlers = &at76_handler_def;
 	dev_alloc_name(netdev, "wlan%d");
 
 	ret = register_netdev(priv->netdev);