On Mon, 13 Jun 2016, Charles Keepax wrote: > Some duplicate defines seem to have snuck into the registers file, this > patch simply removes them. > > Signed-off-by: Charles Keepax <[email protected]> > --- > include/linux/mfd/arizona/registers.h | 6 ------ > 1 file changed, 6 deletions(-)
Applied, thanks. > diff --git a/include/linux/mfd/arizona/registers.h > b/include/linux/mfd/arizona/registers.h > index cd7e78e..0d06c5d 100644 > --- a/include/linux/mfd/arizona/registers.h > +++ b/include/linux/mfd/arizona/registers.h > @@ -856,12 +856,6 @@ > #define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE 0xB38 > #define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE 0xB40 > #define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE 0xB48 > -#define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE 0xB60 > -#define ARIZONA_ISRC2INT2MIX_INPUT_1_SOURCE 0xB68 > -#define ARIZONA_ISRC1INT3MIX_INPUT_1_SOURCE 0xB30 > -#define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE 0xB38 > -#define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE 0xB40 > -#define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE 0xB48 > #define ARIZONA_ISRC2DEC3MIX_INPUT_1_SOURCE 0xB50 > #define ARIZONA_ISRC2DEC4MIX_INPUT_1_SOURCE 0xB58 > #define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE 0xB60 -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

