diff --git a/[refs] b/[refs] index 48cf44abbca6..2642c61f1ed8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf5901b3f1dbf7dd65f477a56eceea7dd3d8fe99 +refs/heads/master: 23b57e4ae67c44087c726bbfa097832e29aed326 diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/Makefile b/trunk/drivers/staging/ft1000/ft1000-usb/Makefile index 7845c47ac64f..dd87ecd7918e 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/Makefile +++ b/trunk/drivers/staging/ft1000/ft1000-usb/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_FT1000_USB) += ft1000.o -ft1000-objs := ft1000_chdev.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o +ft1000-y := ft1000_chdev.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o