Commit c9bab96b authored by Kevin Lloyd's avatar Kevin Lloyd Committed by Greg Kroah-Hartman
Browse files

USB Storage: Sierra: Non-configurable TRU-Install 



This patch alters the Sierra Mass Storage patch so that it is non-configurable.

Signed-off-by: default avatarKevin Lloyd <klloyd@sierrawireless.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e002bcc2

drivers/usb/storage/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -146,18 +146,6 @@ config USB_STORAGE_KARMA 
	  on the resulting scsi device node returns the Karma to normal

	  operation.



config USB_STORAGE_SIERRA

	bool "Sierra Wireless TRU-Install Feature Support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support Sierra Wireless

	  products with the TRU-Install feature (e.g., AC597E, AC881U).



	  This code switches the Sierra Wireless device from being in

	  Mass Storage mode to Modem mode. It also has the ability to

	  support host software upgrades should full Linux support be added

	  to TRU-Install.



config USB_STORAGE_CYPRESS_ATACB

	bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"

	depends on USB_STORAGE

drivers/usb/storage/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o 
usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA)	+= alauda.o

usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH)	+= onetouch.o

usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA)	+= karma.o

usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA)	+= sierra_ms.o

usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o



usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \

			initializers.o $(usb-storage-obj-y)

			initializers.o sierra_ms.o $(usb-storage-obj-y)



ifneq ($(CONFIG_USB_LIBUSUAL),)

	obj-$(CONFIG_USB)	+= libusual.o

drivers/usb/storage/unusual_devs.h

+0 −2
Original line number Diff line number Diff line
@@ -1576,7 +1576,6 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		0),



#ifdef CONFIG_USB_STORAGE_SIERRA

/* Reported by Kevin Lloyd <linux@sierrawireless.com>

 * Entry is needed for the initializer function override,

 * which instructs the device to load as a modem
@@ -1587,7 +1586,6 @@ UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999, 
		"USB MMC Storage",

		US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init,

		0),

#endif



/* Reported by Jaco Kroon <jaco@kroon.co.za>

 * The usb-storage module found on the Digitech GNX4 (and supposedly other

drivers/usb/storage/usb.c

+0 −2
Original line number Diff line number Diff line
@@ -102,9 +102,7 @@ 
#ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB

#include "cypress_atacb.h"

#endif

#ifdef CONFIG_USB_STORAGE_SIERRA

#include "sierra_ms.h"

#endif



/* Some informational data */

MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>");