diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:04 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:04 -0500 |
| commit | 7f2754378f3522a42daafdbb9d2385f341008454 (patch) | |
| tree | 7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/Makefile | |
| parent | c6ad115876763e4f15055982ecb9579cb7abab5f (diff) | |
| parent | a9c5d23ac724a3b908833cafbbbd49abe4741b86 (diff) | |
Merge branch 'next-s3c64xx' into next-merged
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 260864f3f010..3ce88d719ced 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -121,7 +121,10 @@ endif | |||
| 121 | machine-$(CONFIG_ARCH_OMAP3) := omap2 | 121 | machine-$(CONFIG_ARCH_OMAP3) := omap2 |
| 122 | plat-$(CONFIG_ARCH_OMAP) := omap | 122 | plat-$(CONFIG_ARCH_OMAP) := omap |
| 123 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 123 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
| 124 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | ||
| 124 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c | 125 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c |
| 126 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | ||
| 127 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c | ||
| 125 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x | 128 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x |
| 126 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 129 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 127 | machine-$(CONFIG_ARCH_IMX) := imx | 130 | machine-$(CONFIG_ARCH_IMX) := imx |