diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-11 10:10:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-11 10:10:13 -0800 |
| commit | c1cea11227cb57f1ab0f111b3f6e8a250b85cfdb (patch) | |
| tree | b769e1c1bf40401876493c7f522a423d843603d7 | |
| parent | 059fe8296e0fb4b89d997ea0aa75996911b8f3aa (diff) | |
| parent | ceabbf94c317c6175dee6e91805fca4a6353745a (diff) | |
| download | chrome-platform-c1cea11227cb57f1ab0f111b3f6e8a250b85cfdb.tar.gz | |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"Two small clk driver build fixes
- Remove __packed from a Renesas struct to improve portability
- Fix a linking problem with i.MX when config options don't agree"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: renesas: r9a06g032: Drop __packed for portability
clk: imx: scu: fix MXC_CLK_SCU module build break
| -rw-r--r-- | drivers/clk/imx/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/clk/renesas/r9a06g032-clocks.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig index 3b393cb0729513..3061896503f300 100644 --- a/drivers/clk/imx/Kconfig +++ b/drivers/clk/imx/Kconfig @@ -5,8 +5,8 @@ config MXC_CLK depends on ARCH_MXC || COMPILE_TEST config MXC_CLK_SCU - tristate "IMX SCU clock" - depends on ARCH_MXC || COMPILE_TEST + tristate + depends on ARCH_MXC depends on IMX_SCU && HAVE_ARM_SMCCC config CLK_IMX1 diff --git a/drivers/clk/renesas/r9a06g032-clocks.c b/drivers/clk/renesas/r9a06g032-clocks.c index d900f6bf53d0b9..892e91b92f2c80 100644 --- a/drivers/clk/renesas/r9a06g032-clocks.c +++ b/drivers/clk/renesas/r9a06g032-clocks.c @@ -55,7 +55,7 @@ struct r9a06g032_clkdesc { u16 sel, g1, r1, g2, r2; } dual; }; -} __packed; +}; #define I_GATE(_clk, _rst, _rdy, _midle, _scon, _mirack, _mistat) \ { .gate = _clk, .reset = _rst, \ |