aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/Makefile_32
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-01-06 12:47:12 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-01-27 14:49:10 +0900
commit57e97cb8bedd06e8a2e562454423d58aab5827ce (patch)
tree4681eab552da3dcc401c58ace0dea13d970732f4 /arch/sh/kernel/Makefile_32
parent69edbba0021a48fe034849501513930f6175cb5d (diff)
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>
Diffstat (limited to 'arch/sh/kernel/Makefile_32')
-rw-r--r--arch/sh/kernel/Makefile_322
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
index 7e7d22b5b4c..2e1b86e16ab 100644
--- 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