diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-04-14 02:50:21 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-04-14 02:50:21 +0300 |
| commit | 89522f0f8bd5056dec21bb7de073cbd5886e435c (patch) | |
| tree | f4755458dbff71851af23675417173a95271491f /arch/arm/mach-at91/Makefile | |
| parent | e8621d83c10ee95798bdb5e04f54439a7c1c9a2b (diff) | |
| parent | 2e57dc087c27b8b0bd4a9e5f2c6f28f3cd0b47ff (diff) | |
| download | linux-89522f0f8bd5056dec21bb7de073cbd5886e435c.tar.xz | |
Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/multiplatform
Pull "Fourth batch of cleanup for 4.1" from Nicolas Ferre:
- 1 issues revealed by the kbuild test robot fixed
- move of some functions and macros into relevant files to be able to
streamline the at91 specific header afterwards
* tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
ARM: at91/pm: move the standby functions to pm.c
ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
Diffstat (limited to 'arch/arm/mach-at91/Makefile')
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 06a4cefd33a0..4fa8b4541e64 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -17,6 +17,9 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM) += pm_suspend.o +ifeq ($(CONFIG_CPU_V7),y) +AFLAGS_pm_suspend.o := -march=armv7-a +endif ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif |