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: (30 commits)
  [ARM] constify function pointer tables
  [ARM] 4823/1: AT91 section fix
  [ARM] 4824/1: pxa: clear RDH bit after any reset
  [ARM] pxa: remove debugging PM: printk
  ARM: OMAP1: Misc clean-up
  ARM: OMAP1: Update defconfigs for omap1
  ARM: OMAP1: Palm Tungsten E board clean-up
  ARM: OMAP1: Use I2C bus registration helper for omap1
  ARM: OMAP1: Remove omap_sram_idle()
  ARM: OMAP1: PM fixes for OMAP1
  ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
  ARM: OMAP1: Make omap1 use MMC multislot structures
  ARM: OMAP1: Change the comments to C style
  ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
  ARM: OMAP: Add helper module for board specific I2C bus registration
  ARM: OMAP: Add dmtimer support for OMAP3
  ARM: OMAP: Pre-3430 clean-up for dmtimer.c
  ARM: OMAP: Add DMA support for chaining and 3430
  ARM: OMAP: Add 24xx GPIO debounce support
  ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 391b6f4827f6..015a66b3ca8e 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -13,20 +13,20 @@ obj-$(CONFIG_PM) += pm.o sleep.o
 led-y := leds.o
 
 # Specific board support
-obj-$(CONFIG_MACH_OMAP_H2)              += board-h2.o
+obj-$(CONFIG_MACH_OMAP_H2)              += board-h2.o board-h2-mmc.o
 obj-$(CONFIG_MACH_OMAP_INNOVATOR)       += board-innovator.o
 obj-$(CONFIG_MACH_OMAP_GENERIC)         += board-generic.o
 obj-$(CONFIG_MACH_OMAP_PERSEUS2)        += board-perseus2.o
 obj-$(CONFIG_MACH_OMAP_FSAMPLE)         += board-fsample.o
 obj-$(CONFIG_MACH_OMAP_OSK)             += board-osk.o
-obj-$(CONFIG_MACH_OMAP_H3)              += board-h3.o
+obj-$(CONFIG_MACH_OMAP_H3)              += board-h3.o board-h3-mmc.o
 obj-$(CONFIG_MACH_VOICEBLUE)            += board-voiceblue.o
 obj-$(CONFIG_MACH_OMAP_PALMTE)          += board-palmte.o
 obj-$(CONFIG_MACH_OMAP_PALMZ71)         += board-palmz71.o
 obj-$(CONFIG_MACH_OMAP_PALMTT)          += board-palmtt.o
 obj-$(CONFIG_MACH_NOKIA770)             += board-nokia770.o
 obj-$(CONFIG_MACH_AMS_DELTA)            += board-ams-delta.o
-obj-$(CONFIG_MACH_SX1)                  += board-sx1.o
+obj-$(CONFIG_MACH_SX1)                  += board-sx1.o board-sx1-mmc.o
 
 ifeq ($(CONFIG_ARCH_OMAP15XX),y)
 # Innovator-1510 FPGA