diff --git a/[refs] b/[refs]
index e7956ee737a3..3ee37f419882 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29f35c149e887960ccb5a7d31fb5d9f813193418
+refs/heads/master: 9a23e5a2268fc03a55c7e7112ce904629276d0b2
diff --git a/trunk/drivers/net/wireless/ipw2x00/Kconfig b/trunk/drivers/net/wireless/ipw2x00/Kconfig
index 3d5cc4463d4d..1d5dc3e9c5fb 100644
--- a/trunk/drivers/net/wireless/ipw2x00/Kconfig
+++ b/trunk/drivers/net/wireless/ipw2x00/Kconfig
@@ -150,6 +150,7 @@ config IPW2200_DEBUG
 
 config LIBIPW
 	tristate
+	depends on PCI && WLAN_80211
 	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_ARC4