summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Kconfig
diff options
context:
space:
mode:
authorVladimir Zapolskiy2016-01-07 04:07:07 +0100
committerMichael Turquette2016-01-14 03:09:52 +0100
commit3da834e3e5a4a5d26882955298b55a9ed37a00bc (patch)
tree710aecff0ea7c569d4e6b94777921411430375ba /drivers/clk/Kconfig
parentMerge tag 'tegra-for-4.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadkernel-qcow2-linux-3da834e3e5a4a5d26882955298b55a9ed37a00bc.tar.gz
kernel-qcow2-linux-3da834e3e5a4a5d26882955298b55a9ed37a00bc.tar.xz
kernel-qcow2-linux-3da834e3e5a4a5d26882955298b55a9ed37a00bc.zip
clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig
Presumably the second COMMON_CLK_NXP config option in drivers/clk/Kconfig appeared after a merge conflict resolution, remove the wrong record of two. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Diffstat (limited to 'drivers/clk/Kconfig')
-rw-r--r--drivers/clk/Kconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 41f6c7f8e79b..eca8e019e005 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -187,11 +187,6 @@ config COMMON_CLK_PWM
Adapter driver so that any PWM output can be (mis)used as clock signal
at 50% duty cycle.
-config COMMON_CLK_NXP
- def_bool COMMON_CLK && ARCH_LPC18XX
- ---help---
- Support for clock providers on NXP platforms.
-
config COMMON_CLK_PXA
def_bool COMMON_CLK && ARCH_PXA
---help---