Merge tag 'ntb-4.13' of git://github.com/jonmason/ntb

[karo-tx-linux.git] / arch / arm / mach-at91 / Makefile

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index cfd8f60a9268f85f30048e92949c0d13051e71d8..ee34aa34cc51ec284ae2de38376d97f179c414c6 100644 (file)
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -6,10 +6,10 @@
 obj-$(CONFIG_SOC_AT91RM9200)   += at91rm9200.o
 obj-$(CONFIG_SOC_AT91SAM9)     += at91sam9.o
 obj-$(CONFIG_SOC_SAMA5)                += sama5.o
+obj-$(CONFIG_SOC_SAMV7)                += samv7.o
 
 # Power Management
-obj-$(CONFIG_PM)               += pm.o
-obj-$(CONFIG_PM)               += pm_suspend.o
+obj-$(CONFIG_ATMEL_PM)         += pm.o pm_suspend.o
 
 ifeq ($(CONFIG_CPU_V7),y)
 AFLAGS_pm_suspend.o := -march=armv7-a