diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-05-12 12:18:21 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-05-12 12:18:21 -0700 |
| commit | 0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 (patch) | |
| tree | 42f5f09f2c8677389136541815394b76fba07600 /drivers/clk/mvebu/Kconfig | |
| parent | Input: add driver for the Cypress CY8CTMA140 touchscreen (diff) | |
| parent | Linux 5.6 (diff) | |
| download | linux-dev-0fdc50dfab47d525b71a9f0d8310746cdc0c09c5.tar.xz linux-dev-0fdc50dfab47d525b71a9f0d8310746cdc0c09c5.zip | |
Merge tag 'v5.6' into next
Sync up with mainline to get device tree and other changes.
Diffstat (limited to 'drivers/clk/mvebu/Kconfig')
| -rw-r--r-- | drivers/clk/mvebu/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/mvebu/Kconfig b/drivers/clk/mvebu/Kconfig index 415e6906a113..ded07b0bd0d5 100644 --- a/drivers/clk/mvebu/Kconfig +++ b/drivers/clk/mvebu/Kconfig @@ -29,7 +29,7 @@ config ARMADA_39X_CLK select MVEBU_CLK_COMMON config ARMADA_37XX_CLK - bool + bool config ARMADA_XP_CLK bool |