diff --git a/[refs] b/[refs]
index 0fab60c231d2..d1ded59754ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76831125b2e49bfc4b0e0ed9c77015b8d1529a06
+refs/heads/master: a1ecc6a3fe507ecd0fc60a1e881861235bd11097
diff --git a/trunk/drivers/staging/vt6655/Makefile b/trunk/drivers/staging/vt6655/Makefile
index 824c97187872..f7544a6cb63e 100644
--- a/trunk/drivers/staging/vt6655/Makefile
+++ b/trunk/drivers/staging/vt6655/Makefile
@@ -1,6 +1,6 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -D__NO_VERSION__
-EXTRA_CFLAGS += -DHOSTAP
+ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__
+ccflags-y += -DHOSTAP
 
 vt6655_stage-y +=	device_main.o \
 	card.o \