| Message ID | 1461142701-21096-10-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | e05f2e187814b7b102c0f54c9a72c01e6bdb5360 |
| Headers | show |
On Thu, Apr 21, 2016 at 3:12 AM, Greg Ungerer <gregungerer@westnet.com.au> wrote: > On 20/04/16 18:58, Linus Walleij wrote: >> Replace "select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB" >> as this can now be selected directly. >> >> Cc: Michael Büsch <m@bues.ch> >> Cc: Geert Uytterhoeven <geert@linux-m68k.org> >> Cc: linux-m68k@lists.linux-m68k.org >> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > Since this affects ColdFire I am happy to give an ack: > > Acked-by: Greg Ungerer <gerg@linux-m68k.org> Patch applied to the GPIO tree with your ACK. That should be enough I think. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 0dfcf1281e9c..c1beb5ae181f 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -22,11 +22,11 @@ config M68KCLASSIC config COLDFIRE bool "Coldfire CPU family support" - select ARCH_REQUIRE_GPIOLIB select ARCH_HAVE_CUSTOM_GPIO_H select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 select GENERIC_CSUM + select GPIOLIB select HAVE_CLK endchoice
Replace "select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB" as this can now be selected directly. Cc: Michael Büsch <m@bues.ch> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Various arch maintainers: either ACK this and I will merge it into the GPIO tree for v4.7 anticipating no clashes, or you wait until I have the enabling patch upstream (patch 1 in this series, removing deps on ARCH_[WANTS_OPTIONAL|REQUIRES]_GPIOLIB), and you will be able to merge it to your arch trees yourselves for late v4.7 (post GPIO tree merge) or for v4.8. You can also ask me for an immutable branch if you prefer that, I will put the enabling patch on a branch and the patch for your arch on top and ask you to pull it. Select your option from the menu, silence probably means I will merge it to the GPIO tree. Unless you are X86 or ARM in which case I will be cautious. --- arch/m68k/Kconfig.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.4.11 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html