diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 00:57:03 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 10:36:33 +0100 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/Makefile | |
| parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
| parent | ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx (diff) | |
| download | linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.xz linux-880bcd4a8363f24375027f9ded4670960dcfa70a.zip | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1683bfb9166f..0106f75530c0 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -174,7 +174,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_RPC) := rpc -machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 +machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |