diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:09:59 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:09:59 +0200 |
commit | bf7c1d95af67254957d1820ac112397001e1a9a9 (patch) | |
tree | 3adbfbc15812cd4aad20c1ce708fe33b639e0392 /arch/s390/include/asm/qdio.h | |
parent | usb: typec: remove duplicated include from hd3ss3220.c (diff) | |
parent | Linux 5.4-rc3 (diff) | |
download | linux-bf7c1d95af67254957d1820ac112397001e1a9a9.tar.xz linux-bf7c1d95af67254957d1820ac112397001e1a9a9.zip |
Merge 5.4-rc3 into usb-next
we want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/include/asm/qdio.h')
-rw-r--r-- | arch/s390/include/asm/qdio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h index 78e8a888306d..e3f238e8c611 100644 --- a/arch/s390/include/asm/qdio.h +++ b/arch/s390/include/asm/qdio.h @@ -111,7 +111,7 @@ struct qib { /* private: */ u8 res[88]; /* public: */ - u8 parm[QDIO_MAX_BUFFERS_PER_Q]; + u8 parm[128]; } __attribute__ ((packed, aligned(256))); /** |