diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-24 02:32:11 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-24 02:32:11 -0500 |
| commit | 49fb2cd2571e0134e5a12c5abab227696e4940c7 (patch) | |
| tree | 9a77364e988ef3f3af24feee3f5bb91bd0c34129 /arch/sh/kernel/cpu/sh4a/Makefile | |
| parent | dfc349402de8e95f6a42e8341e9ea193b718eee3 (diff) | |
| parent | 260af56271f79da0e37faa5a99b1786b221297e5 (diff) | |
Merge branch 'master' into sh/st-integration
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile index 490d5dc9e372..33bab477d2e2 100644 --- a/arch/sh/kernel/cpu/sh4a/Makefile +++ b/arch/sh/kernel/cpu/sh4a/Makefile | |||
| @@ -44,3 +44,4 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7786) := pinmux-sh7786.o | |||
| 44 | obj-y += $(clock-y) | 44 | obj-y += $(clock-y) |
| 45 | obj-$(CONFIG_SMP) += $(smp-y) | 45 | obj-$(CONFIG_SMP) += $(smp-y) |
| 46 | obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) | 46 | obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) |
| 47 | obj-$(CONFIG_PERF_EVENTS) += perf_event.o | ||