diff --git a/[refs] b/[refs]
index aac9c9b4e62e..f512ea5824f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bc4c36d7cd9f1605efeade67b3d27845a4affcd
+refs/heads/master: 7635d345b2c047339b44c85fff486c6b94b67216
diff --git a/trunk/drivers/net/wireless/hostap/Makefile b/trunk/drivers/net/wireless/hostap/Makefile
index fc62235bfc24..353ccb93134b 100644
--- a/trunk/drivers/net/wireless/hostap/Makefile
+++ b/trunk/drivers/net/wireless/hostap/Makefile
@@ -1,3 +1,4 @@
+hostap-y := hostap_main.o
 obj-$(CONFIG_HOSTAP) += hostap.o
 
 obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
diff --git a/trunk/drivers/net/wireless/hostap/hostap.c b/trunk/drivers/net/wireless/hostap/hostap_main.c
similarity index 100%
rename from trunk/drivers/net/wireless/hostap/hostap.c
rename to trunk/drivers/net/wireless/hostap/hostap_main.c