Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6825d2d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-all' into devel 

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c
parents 6defd904 aa59e19d

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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