From: Jerome Brunet Date: Wed, 4 Jul 2018 16:54:56 +0000 (+0200) Subject: clk: meson: gxbb: remove HHI_GEN_CLK_CTNL duplicate definition X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=80d396b5118f448cb2206a509aba6917691a835e;p=openwrt%2Fstaging%2Fblogic.git clk: meson: gxbb: remove HHI_GEN_CLK_CTNL duplicate definition HHI_GEN_CLK_CTNL is defined twice, just remove the duplicate definition Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") Acked-by: Martin Blumenstingl Signed-off-by: Jerome Brunet --- diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index ec1a812bf1fd..df6c21d368c6 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -66,7 +66,6 @@ #define HHI_USB_CLK_CNTL 0x220 /* 0x88 offset in data sheet */ #define HHI_32K_CLK_CNTL 0x224 /* 0x89 offset in data sheet */ #define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ -#define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ #define HHI_PCM_CLK_CNTL 0x258 /* 0x96 offset in data sheet */ #define HHI_NAND_CLK_CNTL 0x25C /* 0x97 offset in data sheet */