diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/arm/Makefile | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
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 e2274bc0b544..94003142082c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -118,6 +118,7 @@ endif | |||
| 118 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx | 118 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx |
| 119 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 119 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 120 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 120 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 121 | machine-$(CONFIG_ARCH_OMAP3) := omap2 | ||
| 121 | plat-$(CONFIG_ARCH_OMAP) := omap | 122 | plat-$(CONFIG_ARCH_OMAP) := omap |
| 122 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 123 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
| 123 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx | 124 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx |