From 258501a58910f63f07642b49f8cd64e3cd4faffb Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 25 Sep 2006 17:00:52 -0700 Subject: [PATCH] --- yaml --- r: 36478 b: refs/heads/master c: 7f38aa0f04259d37f26e1e906607f1ebb39c0c5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/unusual_devs.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8647da815df9..4c584730a7ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dda171202f94127e49c12daf780cdae1b4e668b +refs/heads/master: 7f38aa0f04259d37f26e1e906607f1ebb39c0c5c diff --git a/trunk/drivers/usb/storage/unusual_devs.h b/trunk/drivers/usb/storage/unusual_devs.h index 1f11c9d44eaa..40bf159f7d54 100644 --- a/trunk/drivers/usb/storage/unusual_devs.h +++ b/trunk/drivers/usb/storage/unusual_devs.h @@ -218,10 +218,12 @@ UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, 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 */ UNUSUAL_DEV( 0x0482, 0x0100, 0x0100, 0x0100,