diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5p6442/Makefile | |
| parent | 32457942b90aabb9242b450f02d18d9c8d982916 (diff) | |
| parent | 7d1a2077a7e519fc0c68617526abea3f72632e60 (diff) | |
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5p6442/Makefile')
| -rw-r--r-- | arch/arm/mach-s5p6442/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6442/Makefile b/arch/arm/mach-s5p6442/Makefile index dde39a6ce6bc..17bd22ee107d 100644 --- a/arch/arm/mach-s5p6442/Makefile +++ b/arch/arm/mach-s5p6442/Makefile | |||
| @@ -12,7 +12,7 @@ obj- := | |||
| 12 | 12 | ||
| 13 | # Core support for S5P6442 system | 13 | # Core support for S5P6442 system |
| 14 | 14 | ||
| 15 | obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o | 15 | obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o dma.o |
| 16 | 16 | ||
| 17 | # machine support | 17 | # machine support |
| 18 | 18 | ||