Merge branch 'omap-all' into devel

Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
git-mirror · Oct 14, 2008 · b6825d2 · b6825d2
2 parents 6defd90 + aa59e19
commit b6825d2
Show file tree

Hide file tree

Showing 104 changed files with 10,646 additions and 908 deletions.
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -118,6 +118,7 @@ endif
  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
  machine-$(CONFIG_ARCH_OMAP1)	   := omap1
  machine-$(CONFIG_ARCH_OMAP2)	   := omap2
+ machine-$(CONFIG_ARCH_OMAP3)	   := omap2
     plat-$(CONFIG_ARCH_OMAP)	   := omap
  machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
     plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx