Message ID | 1411712097-700-1-git-send-email-jszhang@marvell.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/26/2014 08:14 AM, Jisheng Zhang wrote: > Keep options alphabetically sorted. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Jisheng, nice to see you are now contributing directly to Berlin, too. Anyway, I understand that it is nice to have it sorted alphabetically but as long as there is no direct need or relation with any other changes, let's keep it that way. As soon as there are any other patches touching Kconfig, I'll request to squash it in. Is that okay for you? Thanks, Sebastian > --- > arch/arm/mach-berlin/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig > index 5803f77..84d34e0 100644 > --- a/arch/arm/mach-berlin/Kconfig > +++ b/arch/arm/mach-berlin/Kconfig > @@ -3,9 +3,9 @@ menuconfig ARCH_BERLIN > select ARCH_HAS_RESET_CONTROLLER > select ARCH_REQUIRE_GPIOLIB > select ARM_GIC > - select GENERIC_IRQ_CHIP > select DW_APB_ICTL > select DW_APB_TIMER_OF > + select GENERIC_IRQ_CHIP > select PINCTRL > select RESET_CONTROLLER > >
On 30.09.2014 14:19, Sebastian Hesselbarth wrote: > On 09/26/2014 08:14 AM, Jisheng Zhang wrote: >> Keep options alphabetically sorted. >> >> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > > Jisheng, > > nice to see you are now contributing directly to Berlin, too. > Anyway, I understand that it is nice to have it sorted alphabetically > but as long as there is no direct need or relation with any other > changes, let's keep it that way. > > As soon as there are any other patches touching Kconfig, I'll request > to squash it in. Is that okay for you? As I missed the v3.18 merge window, I squashed this into Antoine's patch adding reset controller Kconfigs. Thanks! >> --- >> arch/arm/mach-berlin/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig >> index 5803f77..84d34e0 100644 >> --- a/arch/arm/mach-berlin/Kconfig >> +++ b/arch/arm/mach-berlin/Kconfig >> @@ -3,9 +3,9 @@ menuconfig ARCH_BERLIN >> select ARCH_HAS_RESET_CONTROLLER >> select ARCH_REQUIRE_GPIOLIB >> select ARM_GIC >> - select GENERIC_IRQ_CHIP >> select DW_APB_ICTL >> select DW_APB_TIMER_OF >> + select GENERIC_IRQ_CHIP >> select PINCTRL >> select RESET_CONTROLLER >> >>
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 5803f77..84d34e0 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -3,9 +3,9 @@ menuconfig ARCH_BERLIN select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select ARM_GIC - select GENERIC_IRQ_CHIP select DW_APB_ICTL select DW_APB_TIMER_OF + select GENERIC_IRQ_CHIP select PINCTRL select RESET_CONTROLLER
Keep options alphabetically sorted. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- arch/arm/mach-berlin/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)