diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-11 09:00:14 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-11 09:00:14 +0100 |
| commit | f87114e982cf3b657411e2df50e4e42ec1f162dd (patch) | |
| tree | 16ff1a3f9e975048c5aa30c146bfc5cbc4f04d0c /arch/arm/mach-shmobile/Makefile | |
| parent | ARM: mach-shmobile: cpuidle single/global and last_state fixes (diff) | |
| parent | ARM: mach-shmobile: r8a7740: add INTC support (diff) | |
| download | linux-f87114e982cf3b657411e2df50e4e42ec1f162dd.tar.xz linux-f87114e982cf3b657411e2df50e4e42ec1f162dd.zip | |
Merge branch 'rmobile/a1' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 2aec2f732515..971f7038f05a 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o obj-$(CONFIG_ARCH_SH7377) += setup-sh7377.o clock-sh7377.o intc-sh7377.o obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o clock-sh7372.o intc-sh7372.o obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o +obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o # SMP objects smp-y := platsmp.o headsmp.o @@ -23,12 +24,14 @@ pfc-$(CONFIG_ARCH_SH7367) += pfc-sh7367.o pfc-$(CONFIG_ARCH_SH7377) += pfc-sh7377.o pfc-$(CONFIG_ARCH_SH7372) += pfc-sh7372.o pfc-$(CONFIG_ARCH_SH73A0) += pfc-sh73a0.o +pfc-$(CONFIG_ARCH_R8A7740) += pfc-r8a7740.o # IRQ objects obj-$(CONFIG_ARCH_SH7367) += entry-intc.o obj-$(CONFIG_ARCH_SH7377) += entry-intc.o obj-$(CONFIG_ARCH_SH7372) += entry-intc.o obj-$(CONFIG_ARCH_SH73A0) += entry-gic.o +obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o |