diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-04-09 14:59:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-17 10:50:26 -0700 |
| commit | dfc15e8955338fedf5c5d15622c4042c1e4ee332 (patch) | |
| tree | 0353aae00ce4c1a80eec5cd6273eeb7c7561fb6c /drivers/usb | |
| parent | f4c1a8379a6d1ba39ac7b87f75d1352ef05cffff (diff) | |
| download | linux-dfc15e8955338fedf5c5d15622c4042c1e4ee332.tar.gz | |
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: 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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/storage/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index 5be54c019662..ef7e5a8ceab5 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile @@ -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 |