---

yaml --- r: 107751 b: refs/heads/master c: 25bc2de h: refs/heads/master i: 107749: 5c3b70b 107747: 1e679ca 107743: cd72254 v: v3
git-mirror · Aug 4, 2008 · 826d3d4 · 826d3d4
1 parent a52ba70
commit 826d3d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80693ceb78b08baa3b66a900d9225b2cf9c6f0ed
+refs/heads/master: 25bc2deda9e8a430ed49f507a1120fb2c86abf33
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
@@ -11,10 +11,8 @@ iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o
 iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o
 
 obj-$(CONFIG_IWL4965)	+= iwl4965.o
-iwl4965-objs		:= iwl4965-base.o iwl-4965.o iwl-agn-rs.o
+iwl4965-objs		:= iwl-agn.o iwl-4965.o iwl-agn-rs.o
 
-ifeq ($(CONFIG_IWL5000),y)
-	iwl4965-objs += iwl-5000.o
-endif
+iwl4965-$(CONFIG_IWL5000) += iwl-5000.o
 
 
diff --git a/...ivers/net/wireless/iwlwifi/iwl4965-base.c → trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/...ivers/net/wireless/iwlwifi/iwl4965-base.c → trunk/drivers/net/wireless/iwlwifi/iwl-agn.c