Commit 8ef50901 authored Oct 16, 2008 by Linus Torvalds

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (51 commits)
  [ARM] 5308/1: Fix Viper ISA IRQ handling
  [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
  [ARM] 5306/1: pxa: fix build error on CM-X270
  [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
  [ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary check
  [ARM] 5301/1: ARM: OMAP: Add missing irq defines
  ARM: OMAP3: Add default kernel config for OMAP LDP
  ARM: OMAP3: Add basic board support for OMAP LDP
  ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add Beagle defconfig
  ARM: OMAP3: Add minimal Beagle board support
  ARM: OMAP3: Add minimal omap3430 support
  ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ code
  ARM: OMAP: Fixes to omap_mcbsp_request function
  ARM: OMAP: Add support for OMAP2430 in McBSP
  ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
  ARM: OMAP: Allocate McBSP devices dynamically
  Fix sections for omap-mcbsp platform driver
  [ARM] S3C24XX: Additional include moves
  ...

parents 43526370 25029915

arch/arm/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -118,9 +118,10 @@ 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
		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
		machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
		machine-$(CONFIG_ARCH_VERSATILE) := versatile
		machine-$(CONFIG_ARCH_IMX) := imx