diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:15 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:15 +0200 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5pv210/Makefile | |
| parent | ARM: Merge for-2635/fb-updates1 (diff) | |
| parent | S5PV210: DMA: Add platform devices for PL330 DMACs (diff) | |
| download | linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.xz linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.zip | |
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-s5pv210/Makefile')
| -rw-r--r-- | arch/arm/mach-s5pv210/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 0acbdb34b560..192deac8aaab 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile @@ -12,7 +12,7 @@ obj- := # Core support for S5PV210 system -obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o gpiolib.o +obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o gpiolib.o # machine support |