diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-04-20 18:34:20 +0300 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-04-20 18:34:20 +0300 |
| commit | f7ea285b6266822bd63af2a3695f03e3357fd74f (patch) | |
| tree | ad5d6f3bab25094c81a072fb56fcac2f50ed91ed /include/linux/can/dev/peak_canfd.h | |
| parent | 97e130f63757ede9abc4a9ee42b5fcad466a8e97 (diff) | |
| parent | c7582ff7ed388b803d083166514a4c8acd4ef57d (diff) | |
Merge branch 'ib-pdx86-properties'
Merge branch 'ib-pdx86-properties' of
git://git.infradead.org/linux-platform-drivers-x86.git
to avoid conflicts in PDx86.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'include/linux/can/dev/peak_canfd.h')
| -rw-r--r-- | include/linux/can/dev/peak_canfd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/can/dev/peak_canfd.h b/include/linux/can/dev/peak_canfd.h index 511a37302fea..5fd627e9da19 100644 --- a/include/linux/can/dev/peak_canfd.h +++ b/include/linux/can/dev/peak_canfd.h @@ -189,7 +189,7 @@ struct __packed pucan_rx_msg { u8 client; __le16 flags; __le32 can_id; - u8 d[0]; + u8 d[]; }; /* uCAN error types */ @@ -266,7 +266,7 @@ struct __packed pucan_tx_msg { u8 client; __le16 flags; __le32 can_id; - u8 d[0]; + u8 d[]; }; /* build the cmd opcode_channel field with respect to the correct endianness */ |