diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:00 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:00 +0000 |
commit | c6ad115876763e4f15055982ecb9579cb7abab5f (patch) | |
tree | 75d2b0f5f31540ff8a2dcdde9e0f087b25c68868 /arch/arm/mach-s3c2410/Makefile | |
parent | 1d19fdba149f4db055902c30b27adfb7d1ead058 (diff) | |
parent | 28ab44c5be60a9b91021a7cc7b4e202775c04764 (diff) | |
download | kernel-crypto-c6ad115876763e4f15055982ecb9579cb7abab5f.tar.gz kernel-crypto-c6ad115876763e4f15055982ecb9579cb7abab5f.tar.xz kernel-crypto-c6ad115876763e4f15055982ecb9579cb7abab5f.zip |
Merge branch 'next-s3c24xx' into next-merged
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 00f31f8c4e7..fca02f82711 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o obj-$(CONFIG_S3C2410_GPIO) += gpio.o -obj-$(CONFIG_S3C2410_CLOCK) += clock.o # Machine support |