diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-22 00:35:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-22 00:35:22 +0300 |
| commit | 3d09198243b89457649241fb63f809a96a22a8ce (patch) | |
| tree | f8f62d4a0b47ebc44682363a8d23b8963e1ca3e9 /drivers/clk/sunxi-ng/Kconfig | |
| parent | 52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a (diff) | |
| parent | 48b6bbef9a1789f0365c1a385879a1fea4460016 (diff) | |
| download | linux-3d09198243b89457649241fb63f809a96a22a8ce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/clk/sunxi-ng/Kconfig')
| -rw-r--r-- | drivers/clk/sunxi-ng/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index b0d551a8efe4..eb89c7801f00 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -156,6 +156,7 @@ config SUN8I_R_CCU bool "Support for Allwinner SoCs' PRCM CCUs" select SUNXI_CCU_DIV select SUNXI_CCU_GATE + select SUNXI_CCU_MP default MACH_SUN8I || (ARCH_SUNXI && ARM64) endif |