diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /arch/arm/Makefile | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
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 c8548a187413..24e0f0187697 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 |