diff --git a/[refs] b/[refs]
index d1ded59754ed..2ffd324ed66a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ecc6a3fe507ecd0fc60a1e881861235bd11097
+refs/heads/master: 60930a01983957530693051746bfbf5bb6729d1b
diff --git a/trunk/drivers/staging/vt6656/Makefile b/trunk/drivers/staging/vt6656/Makefile
index 582a3519796d..41ed06bb6654 100644
--- a/trunk/drivers/staging/vt6656/Makefile
+++ b/trunk/drivers/staging/vt6656/Makefile
@@ -1,6 +1,6 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
-EXTRA_CFLAGS += -DHOSTAP
+ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
+ccflags-y += -DHOSTAP
 
 vt6656_stage-y +=	main_usb.o \
 			card.o  \