diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 09:12:47 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 09:12:53 +0400 |
| commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
| tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-davinci/Makefile | |
| parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
| parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
| download | linux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.tar.xz | |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-davinci/Makefile')
| -rw-r--r-- | arch/arm/mach-davinci/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 495e31306fc0..2db78bd5c835 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -4,7 +4,7 @@ # # Common objects -obj-y := time.o clock.o serial.o io.o psc.o \ +obj-y := time.o clock.o serial.o psc.o \ dma.o usb.o common.o sram.o aemif.o obj-$(CONFIG_DAVINCI_MUX) += mux.o |