summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-26 13:19:36 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-26 13:19:36 +0300
commitd19c64b3d0978e741a9b18273ff8a9b52f1a8ca0 (patch)
treec3d8af74acd9bef76a18ea85bafb083b8caafcc3 /include/linux
parent37f6c193e626c93c018e93dc4fe9e4fb454e73d1 (diff)
parent4caf2511ec498277333d229f8a7ad1fa9331df65 (diff)
downloadlinux-d19c64b3d0978e741a9b18273ff8a9b52f1a8ca0.tar.xz
Merge tag 'thunderbolt-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
Mika writes: thunderbolt: Changes for v5.8 merge window This adds support for Intel Tiger Lake Thunderbolt controller using firmware based connection manager. In addition the driver can now be built on non-x86 architectures as well. Then there are a couple of commits that make the driver work across kexec, replace a zero length array with flexible one, and revert one change that is not needed anymore because of NVMem subsystem improvements. * tag 'thunderbolt-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Add trivial .shutdown thunderbolt: Update Kconfig to allow building on other architectures. thunderbolt: Replace zero-length array with flexible-array thunderbolt: Add support for Intel Tiger Lake Revert "thunderbolt: Prevent crash if non-active NVMem file is read"
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/thunderbolt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index ece782ef5466..ff397c0d5c07 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -80,7 +80,7 @@ struct tb {
int index;
enum tb_security_level security_level;
size_t nboot_acl;
- unsigned long privdata[0];
+ unsigned long privdata[];
};
extern struct bus_type tb_bus_type;