diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 18:16:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 18:16:28 +0100 |
| commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
| tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/mach-s3c6410/Makefile | |
| parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
| parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) | |
| download | blackbird-op-linux-29c08460d472e427cec5e5dcb12ec74c923f8250.tar.gz blackbird-op-linux-29c08460d472e427cec5e5dcb12ec74c923f8250.zip | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c6410/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c6410/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c6410/Makefile b/arch/arm/mach-s3c6410/Makefile index 6f9deac88612..3e48c3dbf973 100644 --- a/arch/arm/mach-s3c6410/Makefile +++ b/arch/arm/mach-s3c6410/Makefile @@ -23,5 +23,4 @@ obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci.o obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o obj-$(CONFIG_MACH_NCP) += mach-ncp.o - - +obj-$(CONFIG_MACH_HMT) += mach-hmt.o |
