Skip to content

Commit

Permalink
Merge branch 'omap4' into for-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony Lindgren committed May 28, 2009
2 parents 4c50d22 + b04e897 commit cd07ecc
Show file tree
Hide file tree
Showing 33 changed files with 1,550 additions and 66 deletions.
1 change: 1 addition & 0 deletions arch/arm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ endif
machine-$(CONFIG_ARCH_OMAP1) := omap1
machine-$(CONFIG_ARCH_OMAP2) := omap2
machine-$(CONFIG_ARCH_OMAP3) := omap2
machine-$(CONFIG_ARCH_OMAP4) := omap2
plat-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
Expand Down
Loading

0 comments on commit cd07ecc

Please sign in to comment.