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

Commit 59aaade7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap3-upstream' of...

Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
parents 8e5bdc44 99b3075b
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,7 @@ endif
 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
 machine-$(CONFIG_ARCH_OMAP1)	   := omap1
 machine-$(CONFIG_ARCH_OMAP1)	   := omap1
 machine-$(CONFIG_ARCH_OMAP2)	   := omap2
 machine-$(CONFIG_ARCH_OMAP2)	   := omap2
 machine-$(CONFIG_ARCH_OMAP3)	   := omap2
    plat-$(CONFIG_ARCH_OMAP)	   := omap
    plat-$(CONFIG_ARCH_OMAP)	   := omap
 machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
 machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx
    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx
+1321 −0

File added.

Preview size limit exceeded, changes collapsed.

+1044 −0

File added.

Preview size limit exceeded, changes collapsed.

+1885 −0

File added.

Preview size limit exceeded, changes collapsed.

+21 −1

File changed.

Preview size limit exceeded, changes collapsed.

Loading