From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Mar 2007 12:19:03 +0000 (-0800)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~122
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4a1ca6a9d5db22400d8970f94bba5eae733a0c8;p=linux-2.6-omap-h63xx.git

Merge omap-drivers

Conflicts:

	arch/arm/Kconfig
	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/mailbox.c
	drivers/Makefile
	drivers/cbus/Kconfig
	drivers/cbus/retu-pwrbutton.c
	drivers/cbus/tahvo-usb.c
	drivers/video/omap/Kconfig
	include/linux/i2c-id.h
---

d4a1ca6a9d5db22400d8970f94bba5eae733a0c8
diff --cc arch/arm/Kconfig
index b5e8832e7b3,f86656a7d1f..d75879d9dde
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -961,12 -987,10 +987,6 @@@ source "drivers/mmc/Kconfig
  
  source "drivers/rtc/Kconfig"
  
- source "drivers/ssi/Kconfig"
- 
--if ARCH_OMAP
--source "drivers/cbus/Kconfig"
--endif
--
  endmenu
  
  source "fs/Kconfig"