From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 7 Jan 2011 01:29:26 +0000 (+0900)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.38-rc1~462^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6 into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee
diff --cc arch/arm/Kconfig
index 38cc99bed75,a3fb23be87f..3b7be793d96
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -606,14 -632,9 +632,14 @@@ config ARCH_MS
  	  (clock and power control, etc).
  
  config ARCH_SHMOBILE
 -	bool "Renesas SH-Mobile"
 +	bool "Renesas SH-Mobile / R-Mobile"
 +	select HAVE_CLK
- 	select COMMON_CLKDEV
++	select CLKDEV_LOOKUP
 +	select GENERIC_CLOCKEVENTS
 +	select NO_IOPORT
 +	select SPARSE_IRQ
  	help
 -	  Support for Renesas's SH-Mobile ARM platforms
 +	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
  
  config ARCH_RPC
  	bool "RiscPC"