Vladimir Zapolskiy 3da834e3e5 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>

2016-01-13 18:09:52 -08:00

..

at91

clk: at91: Revert "keep slow clk enabled to prevent system hang"

2015-11-20 10:53:12 -08:00

bcm

Merge branch 'clk-bcm2835' into clk-next

2015-12-24 20:39:02 -08:00

berlin

…

h8300

…

hisilicon

…

imx

Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next

2015-12-22 11:57:35 -08:00

ingenic

…

keystone

…

mediatek

…

meson

…

mmp

clk: mmp: add linux/clk.h includes

2015-11-25 14:06:16 -08:00

mvebu

clk: add Dove PLL divider support for GPU, VMeta and AXI clocks

2015-12-22 12:25:00 -08:00

mxs

…

nxp

clk: lpc32xx: add common clock framework driver

2015-12-24 12:31:26 -08:00

pistachio

…

pxa

…

qcom

Merge branch 'clk-msm8996' into clk-next

2015-12-01 00:00:48 -08:00

rockchip

Merge branch 'clk-rockchip' into clk-next

2016-01-02 13:41:09 -08:00

samsung

clk: s3c2410: removed unneeded variable in s3c24xx_clkout_set_parent

2015-12-16 16:36:04 +01:00

shmobile

Merge branch 'clk-renesas' into clk-next

2015-12-31 15:17:39 -08:00

sirf

…

socfpga

…

spear

…

st

clk: st: avoid uninitialized variable use

2015-11-20 10:59:26 -08:00

sunxi

Allwinner clocks changes for 4.5

2015-12-23 23:23:18 -08:00

tegra

clk: tegra: Read correct IDDQ register in PLL_SS registration

2015-12-17 13:37:58 +01:00

ti

Merge branch 'clk-fixes' into clk-next

2015-12-02 23:29:23 -08:00

ux500

…

versatile

clk: versatile: remove unneeded error message

2015-11-20 09:17:18 -08:00

x86

…

zte

…

zynq

…

clk-asm9260.c

…

clk-axi-clkgen.c

…

clk-axm5516.c

…

clk-cdce706.c

…

clk-cdce925.c

…

clk-clps711x.c

…

clk-composite.c

…

clk-conf.c

…

clk-cs2000-cp.c

clk: add CS2000 Fractional-N driver

2015-11-30 16:33:38 -08:00

clk-devres.c

…

clk-divider.c

clk: divider: Cap table divider values to 'width' member

2015-11-30 18:24:20 -08:00

clk-efm32gg.c

…

clk-fixed-factor.c

…

clk-fixed-rate.c

…

clk-fractional-divider.c

…

clk-gate.c

…

clk-gpio.c

clk: fix clk-gpio.c with optional clock= DT property

2016-01-02 23:19:50 -08:00

clk-highbank.c

…

clk-ls1x.c

…

clk-max77686.c

…

clk-max77802.c

…

clk-max-gen.c

…

clk-max-gen.h

…

clk-mb86s7x.c

…

clk-moxart.c

…

clk-multiplier.c

…

clk-mux.c

clk: fix codying style of if ... else blocks

2015-12-22 10:11:52 -08:00

clk-nomadik.c

…

clk-nspire.c

…

clk-palmas.c

…

clk-pwm.c

…

clk-qoriq.c

clk: qoriq: fix memory leak

2015-11-30 13:00:54 -08:00

clk-rk808.c

…

clk-s2mps11.c

…

clk-scpi.c

clk: scpi: add missing of_node_put

2015-11-30 16:29:15 -08:00

clk-si514.c

…

clk-si570.c

…

clk-si5351.c

clk: si5351: Add PLL soft reset

2015-11-20 10:40:37 -08:00

clk-si5351.h

…

clk-stm32f4.c

…

clk-tango4.c

clk: tango4: clkgen driver for Tango4 platforms

2015-11-16 11:07:06 -08:00

clk-twl6040.c

…

clk-u300.c

…

clk-vt8500.c

…

clk-wm831x.c

…

clk-xgene.c

clk: xgene: Fix divider with non-zero shift value

2015-11-20 10:49:14 -08:00

clk.c

Merge branch 'clk-rockchip' into clk-next

2015-12-23 13:08:56 -08:00

clk.h

…

clkdev.c

…

Kconfig

clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig

2016-01-13 18:09:52 -08:00

Makefile

Merge branch 'clk-lpc32xx' into clk-next

2015-12-24 12:34:29 -08:00