sh: Fix up GENERIC_GPIO build for ARCH_WANT_OPTIONAL_GPIO cases.

CPUs define pinmux tables through the optional interface, while boards
that require demux of their own require it explicitly. Roll the Makefile
rules back to depend on GENERIC_GPIO, which covers both cases.

Fixes a link error with an undefined reference to register_pinmux() on
optional platforms.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
index 7e7d22b5b4cab0417eb309b2199c95f9a570cec9..2e1b86e16ab54184d5d99a720e1b76e8c88adadb 100644 (file)
--- a/arch/sh/kernel/Makefile_32
+++ b/arch/sh/kernel/Makefile_32
@@ -27,7 +27,7 @@ obj-$(CONFIG_CRASH_DUMP)      += crash_dump.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-$(CONFIG_IO_TRAPPED)       += io_trapped.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
-obj-$(CONFIG_ARCH_REQUIRE_GPIOLIB)     += gpio.o
+obj-$(CONFIG_GENERIC_GPIO)     += gpio.o
 obj-$(CONFIG_DYNAMIC_FTRACE)   += ftrace.o
 obj-$(CONFIG_DUMP_CODE)                += disassemble.o
 

diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64
index cbcbbb6c0497ea4ad98ab6f6b93dfc97306b1daf..fe425d7f6871be9d43a151723e584b3b438598a4 100644 (file)
--- a/arch/sh/kernel/Makefile_64
+++ b/arch/sh/kernel/Makefile_64
@@ -15,6 +15,6 @@ obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-$(CONFIG_IO_TRAPPED)       += io_trapped.o
-obj-$(CONFIG_ARCH_REQUIRE_GPIOLIB)     += gpio.o
+obj-$(CONFIG_GENERIC_GPIO)     += gpio.o
 
 EXTRA_CFLAGS += -Werror