From: Andrew Morton <akpm@osdl.org>

In file included from drivers/usb/storage/usb.c:180:
drivers/usb/storage/unusual_devs.h:221: error: 'US_PR_KARMA' undeclared here (not in a function)
drivers/usb/storage/unusual_devs.h:221: error: 'rio_karma_init' undeclared here (not in a function)

Cc: Keith Bennett <keith@mcs.st-and.ac.uk>
Cc: Bob Copeland <me@bobcopeland.com>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/usb/storage/unusual_devs.h |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/usb/storage/usb.c~gregkh-usb-usb-storage-add-rio-karma-eject-support-fix drivers/usb/storage/usb.c
diff -puN drivers/usb/storage/unusual_devs.h~gregkh-usb-usb-storage-add-rio-karma-eject-support-fix drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/unusual_devs.h~gregkh-usb-usb-storage-add-rio-karma-eject-support-fix
+++ a/drivers/usb/storage/unusual_devs.h
@@ -218,10 +218,12 @@ UNUSUAL_DEV(  0x0457, 0x0151, 0x0100, 0x
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_NOT_LOCKABLE ),
 
+#ifdef CONFIG_USB_STORAGE_KARMA
 UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
 		"Rio",
 		"Rio Karma",
 		US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0),
+#endif
 
 /* Patch submitted by Philipp Friedrich <philipp@void.at> */
 UNUSUAL_DEV(  0x0482, 0x0100, 0x0100, 0x0100,
_