usb-storage: fix mistake in Makefile
authorAlan Stern <stern@rowland.harvard.edu>
Thu, 9 Apr 2009 18:59:44 +0000 (14:59 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 17 Apr 2009 17:50:26 +0000 (10:50 -0700)
This patch (as1228) fixes a Makefile error introduced when the
subdrivers in usb-storage were split out into separate modules.  The
intention is that when CONFIG_USB_LIBUSUAL is set, libusual.o and
usual-tables.o should be combined into a single object file (called
usb-libusual).  The current Makefile will instead create two separate
objects, and the result won't load properly.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: Alan Jenkins <sourcejedi.lkml@googlemail.com>
Reported-and-tested-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/storage/Makefile

index 5be54c01966219608675b8338cf8d114d7d0cf59..ef7e5a8ceab56616af1b86535144b65b5584d66b 100644 (file)
@@ -17,7 +17,8 @@ usb-storage-objs :=   scsiglue.o protocol.o transport.o usb.o \
 ifeq ($(CONFIG_USB_LIBUSUAL),)
        usb-storage-objs        += usual-tables.o
 else
-       obj-$(CONFIG_USB)       += libusual.o usual-tables.o
+       obj-$(CONFIG_USB)       += usb-libusual.o
+       usb-libusual-objs       := libusual.o usual-tables.o
 endif
 
 obj-$(CONFIG_USB_STORAGE_ALAUDA)       += ums-alauda.o