git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
avr32
/
mach-at32ap
/
Makefile
diff --git
a/arch/avr32/mach-at32ap/Makefile
b/arch/avr32/mach-at32ap/Makefile
index 5e9f8217befc16f4095918f8be3c710a1c4fb621..e89009439e4aebf043bf335561ba7b1f93e7d4db 100644
(file)
--- a/
arch/avr32/mach-at32ap/Makefile
+++ b/
arch/avr32/mach-at32ap/Makefile
@@
-1,4
+1,3
@@
obj-y += at32ap.o clock.o intc.o extint.o pio.o hsmc.o
-obj-$(CONFIG_CPU_AT32AP700X) += at32ap700x.o
-obj-$(CONFIG_CPU_AT32AP700X) += time-tc.o
+obj-$(CONFIG_CPU_AT32AP700X) += at32ap700x.o pm-at32ap700x.o
obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o