diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 18:57:03 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 04:36:33 -0500 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/Makefile | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
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 1683bfb9166..0106f75530c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -174,7 +174,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 | |||
| 174 | machine-$(CONFIG_ARCH_PXA) := pxa | 174 | machine-$(CONFIG_ARCH_PXA) := pxa |
| 175 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 175 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 176 | machine-$(CONFIG_ARCH_RPC) := rpc | 176 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 177 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 | 177 | machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 |
| 178 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 178 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 179 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 | 179 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 |
| 180 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 180 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |