diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 00:04:06 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 00:04:06 -0400 |
commit | ebf9c118df678de111eda45709081806f71710cc (patch) | |
tree | a4e48873a8e26c809661b5929dd54e1a6867c28c /arch/sh/kernel/Makefile_32 | |
parent | 7639a4541f7e7abb1295ff8ab39cc2f5842239ae (diff) |
sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected.
The pinmux management is tied in to this code, while it is presently only
used by platforms that select GENERIC_GPIO. The asm/gpio.h definitions
are not referenced when GENERIC_GPIO is disabled, resulting in a build
failure for all of the platforms that don't select it.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/Makefile_32')
-rw-r--r-- | arch/sh/kernel/Makefile_32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 index 7c41ac7c298c..48edfb145fb4 100644 --- a/arch/sh/kernel/Makefile_32 +++ b/arch/sh/kernel/Makefile_32 | |||
@@ -5,7 +5,7 @@ | |||
5 | extra-y := head_32.o init_task.o vmlinux.lds | 5 | extra-y := head_32.o init_task.o vmlinux.lds |
6 | 6 | ||
7 | obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \ | 7 | obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \ |
8 | ptrace_32.o setup.o signal_32.o sys_sh.o sys_sh32.o gpio.o \ | 8 | ptrace_32.o setup.o signal_32.o sys_sh.o sys_sh32.o \ |
9 | syscalls_32.o time_32.o topology.o traps.o traps_32.o | 9 | syscalls_32.o time_32.o topology.o traps.o traps_32.o |
10 | 10 | ||
11 | obj-y += cpu/ timers/ | 11 | obj-y += cpu/ timers/ |
@@ -23,5 +23,6 @@ obj-$(CONFIG_PM) += pm.o | |||
23 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 23 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
24 | obj-$(CONFIG_IO_TRAPPED) += io_trapped.o | 24 | obj-$(CONFIG_IO_TRAPPED) += io_trapped.o |
25 | obj-$(CONFIG_KPROBES) += kprobes.o | 25 | obj-$(CONFIG_KPROBES) += kprobes.o |
26 | obj-$(CONFIG_GENERIC_GPIO) += gpio.o | ||
26 | 27 | ||
27 | EXTRA_CFLAGS += -Werror | 28 | EXTRA_CFLAGS += -Werror |