Commit dfc15e89 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

usb-storage: fix mistake in Makefile

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: default avatarAlan Jenkins <sourcejedi.lkml@googlemail.com>
Reported-and-tested-by: default avatarMike Galbraith <efault@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f4c1a837
...@@ -17,7 +17,8 @@ usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ ...@@ -17,7 +17,8 @@ usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
ifeq ($(CONFIG_USB_LIBUSUAL),) ifeq ($(CONFIG_USB_LIBUSUAL),)
usb-storage-objs += usual-tables.o usb-storage-objs += usual-tables.o
else else
obj-$(CONFIG_USB) += libusual.o usual-tables.o obj-$(CONFIG_USB) += usb-libusual.o
usb-libusual-objs := libusual.o usual-tables.o
endif endif
obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment