diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 10:15:49 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 10:15:49 +0400 |
commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /arch/arm/mach-s3c2410/Makefile | |
parent | 583af252ab07cd1e8721878463da5b7016c18fdc (diff) | |
parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
download | linux-9aa7719e0c6a1580451900e672744752804f8f75.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-s3c2410/Makefile')
-rw-r--r-- | arch/arm/mach-s3c2410/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index 0d468e96e83e..81695353d8f4 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile @@ -10,7 +10,6 @@ obj-n := obj- := obj-$(CONFIG_CPU_S3C2410) += s3c2410.o -obj-$(CONFIG_CPU_S3C2410) += irq.o obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o |