Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57e97cb8 authored Jan 06, 2009 by Paul Mundt

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>

parent 69edbba0

arch/sh/kernel/Makefile_32

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/sh/kernel/Makefile_64

+1 −1

Original line number	Diff line number	Diff line
		@@ -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