diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
| commit | ad2e6329666650d9cafcae9ef53fbe09ea759ae2 (patch) | |
| tree | b23eb258fa609be246bb44cd9b33ff86d8142ca7 /include/linux/ipc_namespace.h | |
| parent | 1ee0a224bc9aad1de496c795f96bc6ba2c394811 (diff) | |
| parent | b810075002c9f25a6da83cecda39d789000a04a9 (diff) | |
Merge tag 'fixes-for-v3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.8-rc5
Finally we have a build fix for fsl-mxc-udc UDC driver.
We also have a fix for ep0 maxburst setting on DWC3
which could confuse the HW if we tell it we had way
too many streams on that endpoint when it _has_ to be
only one.
cppi_dma support for MUSB got a fix when running as a
module. By dropping the wrong __init annotation, the
function will be available even when we're modules and
we're done with .init.text section.
Last, but not least, we have a fix on FunctionFS which
was causing a bug on our option parsing algorithm.
Diffstat (limited to 'include/linux/ipc_namespace.h')
| -rw-r--r-- | include/linux/ipc_namespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index fe771978e877..ae221a7b5092 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
| @@ -24,6 +24,7 @@ struct ipc_ids { | |||
| 24 | unsigned short seq_max; | 24 | unsigned short seq_max; |
| 25 | struct rw_semaphore rw_mutex; | 25 | struct rw_semaphore rw_mutex; |
| 26 | struct idr ipcs_idr; | 26 | struct idr ipcs_idr; |
| 27 | int next_id; | ||
| 27 | }; | 28 | }; |
| 28 | 29 | ||
| 29 | struct ipc_namespace { | 30 | struct ipc_namespace { |
