Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / drivers / clk / Kconfig

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 41f6c7f8e79bce48194f7e3ce09db885dd2ebafa..eca8e019e0054bb7443c63196b01ca217fabbd55 100644 (file)
--- 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---