From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Apr 2008 21:45:05 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~208
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9fc4e5b78557b728eadedb9a9688646691f86808;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
	arch/arm/kernel/asm-offsets.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock.h
	arch/arm/mach-omap2/clock24xx.c
	arch/arm/mach-omap2/clock24xx.h
	arch/arm/mach-omap2/clock34xx.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/mach-omap2/cm-regbits-34xx.h
	arch/arm/mach-omap2/cm.h
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/prcm.c
	arch/arm/mach-omap2/prm.h
	arch/arm/mach-omap2/sdrc.h
	arch/arm/mach-omap2/sleep.S
	arch/arm/mach-omap2/sram-fn.S
	arch/arm/mm/Kconfig
	arch/arm/plat-omap/clock.c
	drivers/mmc/host/omap.c
	include/asm-arm/arch-omap/clock.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/mux.h
	include/asm-arm/glue.h
	include/asm-arm/thread_info.h
---

9fc4e5b78557b728eadedb9a9688646691f86808
diff --cc arch/arm/Kconfig
index f8a7d222f99,d8d253285a9..c60a27dd765
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1175,11 -1192,8 +1192,13 @@@ source "drivers/dma/Kconfig
  
  source "drivers/dca/Kconfig"
  
+ source "drivers/uio/Kconfig"
+ 
 +if ARCH_OMAP
 +source "drivers/cbus/Kconfig"
 +source "drivers/dsp/dspgateway/Kconfig"
 +endif
 +
  endmenu
  
  source "fs/Kconfig"
diff --cc arch/arm/mm/Kconfig
index 1626f5c170b,746cbb7c8e9..15066c29a84
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -408,7 -409,7 +409,7 @@@ config CPU_32v6
  # ARMv7
  config CPU_V7
  	bool "Support ARM V7 processor"
- 	depends on ARCH_INTEGRATOR || ARCH_OMAP3
 -	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB
++	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3
  	select CPU_32v6K
  	select CPU_32v7
  	select CPU_ABRT_EV7