Skip to content

Commit

Permalink
sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
Browse files Browse the repository at this point in the history
SH GPIO drivers all use gpiolib and CONFIG_GENERIC_GPIO is only selected
through CONFIG_GPIOLIB, yet some compilation units depended on
CONFIG_GENERIC_GPIO. Make them depend on CONFIG_GPIOLIB instead since it
is more accurate and prepares us for the future removal of
CONFIG_GENERIC_GPIO.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Alexandre Courbot committed Mar 20, 2013
1 parent a76eb09 commit 95188aa
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/sh/boards/mach-sdk7786/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
obj-y := fpga.o irq.o nmi.o setup.o

obj-$(CONFIG_GENERIC_GPIO) += gpio.o
obj-$(CONFIG_GPIOLIB) += gpio.o
obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o
2 changes: 1 addition & 1 deletion arch/sh/boards/mach-x3proto/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
obj-y += setup.o ilsel.o

obj-$(CONFIG_GENERIC_GPIO) += gpio.o
obj-$(CONFIG_GPIOLIB) += gpio.o
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh2a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203) := pinmux-sh7203.o
pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o
pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o

obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7712) := clock-sh7712.o
pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o

obj-y += $(clock-y)
obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh4a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SHX3) := pinmux-shx3.o

obj-y += $(clock-y)
obj-$(CONFIG_SMP) += $(smp-y)
obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o

0 comments on commit 95188aa

Please sign in to comment.