git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
usb
/
storage
/
usb.c
diff --git
a/drivers/usb/storage/usb.c
b/drivers/usb/storage/usb.c
index
dd10863
..
0142fe8
100644
(file)
--- a/
drivers/usb/storage/usb.c
+++ b/
drivers/usb/storage/usb.c
@@
-593,6
+593,15
@@
static int get_transport(struct us_data *us)
break;
#endif
break;
#endif
+#ifdef CONFIG_USB_STORAGE_ALAUDA
+ case US_PR_ALAUDA:
+ us->transport_name = "Alauda Control/Bulk";
+ us->transport = alauda_transport;
+ us->transport_reset = usb_stor_Bulk_reset;
+ us->max_lun = 1;
+ break;
+#endif
+
default:
return -EIO;
}
default:
return -EIO;
}
@@
-648,15
+657,6
@@
static int get_protocol(struct us_data *us)
break;
#endif
break;
#endif
-#ifdef CONFIG_USB_STORAGE_ALAUDA
- case US_PR_ALAUDA:
- us->transport_name = "Alauda Control/Bulk";
- us->transport = alauda_transport;
- us->transport_reset = usb_stor_Bulk_reset;
- us->max_lun = 1;
- break;
-#endif
-
default:
return -EIO;
}
default:
return -EIO;
}