diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/plat-s3c/Makefile | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (diff) | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 (diff) | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/plat-s3c/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile deleted file mode 100644 index 89dbdb0adeb..00000000000 --- a/arch/arm/plat-s3c/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# arch/arm/plat-s3c/Makefile -# -# Copyright 2008 Simtec Electronics -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := -obj- := - -# Core support for all Samsung SoCs - -obj-y += init.o -obj-y += time.o - -# DMA support - -obj-$(CONFIG_S3C_DMA) += dma.o - -# PM support - -obj-$(CONFIG_PM) += pm.o |