---

yaml --- r: 278619 b: refs/heads/master c: 481f564 h: refs/heads/master i: 278617: 79429cc 278615: b2f1959 v: v3
git-mirror · Dec 6, 2011 · 9fa83c5 · 9fa83c5
1 parent 22e4dd4
commit 9fa83c5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d5f3ec52939607511a660b01fc34d11ad71ae24
+refs/heads/master: 481f564ac72b2f6c77ba80e7a31932365bd21a35
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
@@ -1,7 +1,7 @@
 # WIFI
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o
 iwlwifi-objs		:= iwl-agn.o iwl-agn-rs.o iwl-mac80211.o
-iwlwifi-objs		+= iwl-agn-ucode.o iwl-agn-tx.o
+iwlwifi-objs		+= iwl-ucode.o iwl-agn-tx.o
 iwlwifi-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
 iwlwifi-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
 

diff --git a/...vers/net/wireless/iwlwifi/iwl-agn-ucode.c → .../drivers/net/wireless/iwlwifi/iwl-ucode.c b/...vers/net/wireless/iwlwifi/iwl-agn-ucode.c → .../drivers/net/wireless/iwlwifi/iwl-ucode.c