diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
| commit | fac805f8c198092de9a2842efd7f5022e2937b18 (patch) | |
| tree | 7557809c373f97a343c427d8fded0696060394ce /arch/arm/mach-shmobile/Makefile | |
| parent | rtlwifi: Update header file (diff) | |
| parent | libertas sdio: fix suspend when interface is down (diff) | |
| download | linux-fac805f8c198092de9a2842efd7f5022e2937b18.tar.xz linux-fac805f8c198092de9a2842efd7f5022e2937b18.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 8aa1962c22a2..0df5ae6740c6 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -39,7 +39,9 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o +obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o +obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o # Board objects |