aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-15 16:27:14 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-15 16:27:14 -0700
commit98dc1382efb52ca1423870b2b0673eac399857c1 (patch)
tree305ff168939b47d8e01168e6b914a2d11fc9eb9d /usb.current
parent9420d00beb613b2fcb4d76c354b51db7d4405105 (diff)
downloadpatches-98dc1382efb52ca1423870b2b0673eac399857c1.tar.gz
more patches
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch31
-rw-r--r--usb.current/usb-storage-fix-mistake-in-makefile.patch37
2 files changed, 68 insertions, 0 deletions
diff --git a/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch b/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch
new file mode 100644
index 00000000000000..8a38deb07cd06b
--- /dev/null
+++ b/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch
@@ -0,0 +1,31 @@
+From dr.gregory.h.wettstein.phd@ndsu.edu Wed Apr 15 16:17:36 2009
+From: Dr. Greg Wettstein <greg@enjellic.com>
+Date: Sat, 11 Apr 2009 09:12:08 -0500
+Subject: USB: Add device ID for Motorola v950 'Renegade' phone.
+Subject: Re: USB device codes for Motorola phone.
+To: Greg KH <greg@kroah.com>
+Message-ID: <200904111412.n3BEC8vW007249@habu.cc.ndsu.nodak.edu>
+
+The v950 appears to be a ruggedized version of the Motorola Razor
+phone. Tethering to the phone to use it in 'phone as modem' mode
+requires the use of the specialized moto-modem driver which layers
+over the usb-serial driver. Support for the v950 was added simply
+adding the device ID's for the phone.
+
+Signed-off-by: Dr. Greg Wettstein <greg@enjellic.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/moto_modem.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/serial/moto_modem.c
++++ b/drivers/usb/serial/moto_modem.c
+@@ -25,6 +25,7 @@ static struct usb_device_id id_table []
+ { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */
+ { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */
+ { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */
++ { USB_DEVICE(0x22b8, 0x2c64) }, /* Motorola V950 phone */
+ { },
+ };
+ MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/usb.current/usb-storage-fix-mistake-in-makefile.patch b/usb.current/usb-storage-fix-mistake-in-makefile.patch
new file mode 100644
index 00000000000000..f2f736c8aab579
--- /dev/null
+++ b/usb.current/usb-storage-fix-mistake-in-makefile.patch
@@ -0,0 +1,37 @@
+From stern@rowland.harvard.edu Wed Apr 15 16:15:37 2009
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Thu, 9 Apr 2009 14:59:44 -0400 (EDT)
+Subject: usb-storage: fix mistake in Makefile
+To: Greg KH <greg@kroah.com>, Matthew Dharm <mdharm-usb@one-eyed-alien.net>
+Cc: Alan Jenkins <sourcejedi.lkml@googlemail.com>, Mike Galbraith <efault@gmx.de>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <Pine.LNX.4.44L0.0904091455440.2992-100000@iolanthe.rowland.org>
+
+
+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 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/storage/Makefile
++++ b/drivers/usb/storage/Makefile
+@@ -17,7 +17,8 @@ usb-storage-objs := scsiglue.o protocol.
+ 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