diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
| commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
| tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/Makefile | |
| parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
| parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) | |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e84729bf13d4..676d10d028b5 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -127,6 +127,7 @@ endif | |||
| 127 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 127 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 128 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 128 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 129 | machine-$(CONFIG_ARCH_OMAP3) := omap2 | 129 | machine-$(CONFIG_ARCH_OMAP3) := omap2 |
| 130 | machine-$(CONFIG_ARCH_OMAP4) := omap2 | ||
| 130 | plat-$(CONFIG_ARCH_OMAP) := omap | 131 | plat-$(CONFIG_ARCH_OMAP) := omap |
| 131 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 132 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
| 132 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 133 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |