aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 17:21:02 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 17:21:02 -0700
commit54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch)
tree4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /drivers/usb/storage/Makefile
parent6d8de3a26b5c20b04a9317b4446582167d5883da (diff)
parentb71e318cdb1dc301d734fdd4983dfc6dc167235a (diff)
downloadkernel_samsung_smdk4412-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.zip
kernel_samsung_smdk4412-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.tar.gz
kernel_samsung_smdk4412-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/storage/Makefile')
-rw-r--r--drivers/usb/storage/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 56652cc..44ab8f9 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -18,6 +18,7 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM) += dpcm.o
usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200) += isd200.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB) += datafab.o
usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH) += onetouch.o
usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
initializers.o $(usb-storage-obj-y)