From: Vladimir Zapolskiy Date: Thu, 7 Jan 2016 03:07:07 +0000 (+0200) Subject: clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig X-Git-Tag: Ubuntu-4.8.0-22.24~2044^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3da834e3e5a4a5d26882955298b55a9ed37a00bc;p=mirror_ubuntu-zesty-kernel.git 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 Signed-off-by: Michael Turquette --- 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---