diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-11-05 11:00:40 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-05 11:00:40 +0100 |
commit | c196924277ea82200d4c4fd9537c71390b96f247 (patch) | |
tree | 2f76c094c3adee9c041e9e89a9431c5c7ef08e85 /arch/s390/include/asm/qdio.h | |
parent | gpio: Add xgs-iproc driver (diff) | |
parent | Linux 5.4-rc6 (diff) | |
download | linux-c196924277ea82200d4c4fd9537c71390b96f247.tar.xz linux-c196924277ea82200d4c4fd9537c71390b96f247.zip |
Merge tag 'v5.4-rc6' into devel
Linux 5.4-rc6
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))); /** |