git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream-fixes
[pandora-kernel.git]
/
include
/
linux
/
usb_usual.h
diff --git
a/include/linux/usb_usual.h
b/include/linux/usb_usual.h
index
e7fc5fe
..
2ae76fe
100644
(file)
--- a/
include/linux/usb_usual.h
+++ b/
include/linux/usb_usual.h
@@
-108,6
+108,9
@@
enum { US_DO_ALL_FLAGS };
#ifdef CONFIG_USB_STORAGE_ALAUDA
#define US_PR_ALAUDA 0xf4 /* Alauda chipsets */
#endif
+#ifdef CONFIG_USB_STORAGE_KARMA
+#define US_PR_KARMA 0xf5 /* Rio Karma */
+#endif
#define US_PR_DEVICE 0xff /* Use device's value */