diff --git a/[refs] b/[refs]
index 25bf2ab8b9a7..7437dde48d90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 735f48f57d922a7839506dd60e89858896d6c6f5
+refs/heads/master: bdc1b7bde2174d19d5566acc3d51d041f9a9bbf5
diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/Makefile b/trunk/drivers/staging/ft1000/ft1000-pcmcia/Makefile
index 30ad20878b67..660b7a50e891 100644
--- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/Makefile
+++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_FT1000_PCMCIA) = ft1000_pcmcia.o
-ft1000_pcmcia-objs := ft1000_hw.o ft1000_dnld.o ft1000_proc.o ft1000_cs.o
+ft1000_pcmcia-y := ft1000_hw.o ft1000_dnld.o ft1000_proc.o ft1000_cs.o