diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 13:24:42 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 13:24:42 +0300 |
commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /drivers/phy/samsung/phy-samsung-usb2.h | |
parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) | |
download | linux-2c92d787cc9fad57d05c96bd117782183768258a.tar.xz |
Merge branch 'linus' into x86/entry, to resolve conflicts
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/phy/samsung/phy-samsung-usb2.h')
-rw-r--r-- | drivers/phy/samsung/phy-samsung-usb2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/samsung/phy-samsung-usb2.h b/drivers/phy/samsung/phy-samsung-usb2.h index 2c1a7d71142b..77fb23bc218f 100644 --- a/drivers/phy/samsung/phy-samsung-usb2.h +++ b/drivers/phy/samsung/phy-samsung-usb2.h @@ -43,7 +43,7 @@ struct samsung_usb2_phy_driver { struct regmap *reg_pmu; struct regmap *reg_sys; spinlock_t lock; - struct samsung_usb2_phy_instance instances[0]; + struct samsung_usb2_phy_instance instances[]; }; struct samsung_usb2_common_phy { |