Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 95188aaf9fc81e9539606cad5c9579bd27604f92

Authored by Alexandre Courbot
1 parent a76eb09ae3
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB 

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>

Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/sh/boards/mach-sdk7786/Makefile
Diff comments   View file @ 95188aa
1 1 obj-y := fpga.o irq.o nmi.o setup.o
2 2  
3   -obj-$(CONFIG_GENERIC_GPIO) += gpio.o
  3 +obj-$(CONFIG_GPIOLIB) += gpio.o
4 4 obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o
arch/sh/boards/mach-x3proto/Makefile
Diff comments   View file @ 95188aa
1 1 obj-y += setup.o ilsel.o
2 2  
3   -obj-$(CONFIG_GENERIC_GPIO) += gpio.o
  3 +obj-$(CONFIG_GPIOLIB) += gpio.o
arch/sh/kernel/cpu/sh2a/Makefile
Diff comments   View file @ 95188aa
... ... @@ -21,5 +21,5 @@
21 21 pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o
22 22 pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o
23 23  
24   -obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
  24 +obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
arch/sh/kernel/cpu/sh3/Makefile
Diff comments   View file @ 95188aa
... ... @@ -30,5 +30,5 @@
30 30 pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o
31 31  
32 32 obj-y += $(clock-y)
33   -obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
  33 +obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
arch/sh/kernel/cpu/sh4a/Makefile
Diff comments   View file @ 95188aa
... ... @@ -47,7 +47,7 @@
47 47  
48 48 obj-y += $(clock-y)
49 49 obj-$(CONFIG_SMP) += $(smp-y)
50   -obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
  50 +obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
51 51 obj-$(CONFIG_PERF_EVENTS) += perf_event.o
52 52 obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o