diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 08:32:26 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 08:32:26 -0600 |
commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
tree | d1b99d186edb9d203fafd896f19487125a2395af /arch/arm/mach-s3c2410/Makefile | |
parent | 2e2de2e314672c8b6644f67a35556d6df780493d (diff) | |
parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
download | lwn-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.gz lwn-f8db4cc4f2b11bdded6c94f0d55906847474b982.zip |
Merge branch 'spi/merge' into spi/next
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 |