diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 21:59:33 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 21:59:33 +0100 |
commit | 8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d (patch) | |
tree | 18cdadced0870584ceffa02eed47f4c86da8263c /include/dt-bindings/clock/marvell,mmp2.h | |
parent | spmi: pmic-arb: select IRQ_DOMAIN_HIERARCHY in Kconfig (diff) | |
parent | gpio: altera-a10sr: Trivial coding style fix (diff) | |
download | linux-dev-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.tar.xz linux-dev-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.zip |
Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel
gpio updates for v5.1
- support for a new variant of pca953x
- documentation fix from Wolfram
- some tegra186 name changes
- two minor fixes for madera and altera-a10sr
Diffstat (limited to 'include/dt-bindings/clock/marvell,mmp2.h')
-rw-r--r-- | include/dt-bindings/clock/marvell,mmp2.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/marvell,mmp2.h b/include/dt-bindings/clock/marvell,mmp2.h index 7b24fc791146..228a5e234af0 100644 --- a/include/dt-bindings/clock/marvell,mmp2.h +++ b/include/dt-bindings/clock/marvell,mmp2.h @@ -71,7 +71,6 @@ #define MMP2_CLK_CCIC1_MIX 117 #define MMP2_CLK_CCIC1_PHY 118 #define MMP2_CLK_CCIC1_SPHY 119 -#define MMP2_CLK_SP 120 #define MMP2_NR_CLKS 200 #endif |