diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
| commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
| tree | e86e692f26d4879ff2210c54722e2b7780210249 /include/uapi/linux/usb/ch11.h | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | d4ed3b9015b5eebc90d629579d9e7944607cbae5 (diff) | |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'include/uapi/linux/usb/ch11.h')
| -rw-r--r-- | include/uapi/linux/usb/ch11.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/ch11.h b/include/uapi/linux/usb/ch11.h index 361297e96f58..576c704e3fb8 100644 --- a/include/uapi/linux/usb/ch11.h +++ b/include/uapi/linux/usb/ch11.h | |||
| @@ -22,6 +22,9 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define USB_MAXCHILDREN 31 | 23 | #define USB_MAXCHILDREN 31 |
| 24 | 24 | ||
| 25 | /* See USB 3.1 spec Table 10-5 */ | ||
| 26 | #define USB_SS_MAXPORTS 15 | ||
| 27 | |||
| 25 | /* | 28 | /* |
| 26 | * Hub request types | 29 | * Hub request types |
| 27 | */ | 30 | */ |