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/plat-samsung/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/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 0ad820acc38..ca6036745ed 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
| @@ -46,6 +46,8 @@ obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o | |||
| 46 | 46 | ||
| 47 | obj-$(CONFIG_S3C_DMA) += dma.o | 47 | obj-$(CONFIG_S3C_DMA) += dma.o |
| 48 | 48 | ||
| 49 | obj-$(CONFIG_S3C_PL330_DMA) += s3c-pl330.o | ||
| 50 | |||
| 49 | # PM support | 51 | # PM support |
| 50 | 52 | ||
| 51 | obj-$(CONFIG_PM) += pm.o | 53 | obj-$(CONFIG_PM) += pm.o |