diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 10:53:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 10:53:42 -0700 |
| commit | 28efb9e1a758435bb9d49798400fb0373d018d5c (patch) | |
| tree | bc7f376f5cc37776068d6e52a8daba8595692e27 /arch/avr32/mach-at32ap/Makefile | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| parent | 33f197a603e61ddd099c29e94166d3172cdf57e4 (diff) | |
| download | talos-op-linux-28efb9e1a758435bb9d49798400fb0373d018d5c.tar.gz talos-op-linux-28efb9e1a758435bb9d49798400fb0373d018d5c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Make atstk1006_nand_data definition static
avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100
avr32: Update defconfigs
avr32: Clean up HMATRIX code
avr32: Add MMIO address definitions for certain controllers
avr32: Introduce <mach/chip.h>
avr32: Remove include/asm-avr32/arch-at32ap
Diffstat (limited to 'arch/avr32/mach-at32ap/Makefile')
| -rw-r--r-- | arch/avr32/mach-at32ap/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/mach-at32ap/Makefile b/arch/avr32/mach-at32ap/Makefile index d5018e2eed25..514c9a9b009a 100644 --- a/arch/avr32/mach-at32ap/Makefile +++ b/arch/avr32/mach-at32ap/Makefile @@ -1,4 +1,5 @@ obj-y += pdc.o clock.o intc.o extint.o pio.o hsmc.o +obj-y += hmatrix.o obj-$(CONFIG_CPU_AT32AP700X) += at32ap700x.o pm-at32ap700x.o obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o obj-$(CONFIG_PM) += pm.o |
