Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Fri, 7 Jan 2011 01:29:26 +0000 (10:29 +0900)]
Conflicts:
arch/arm/mach-shmobile/Kconfig

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

1  2 
arch/arm/Kconfig
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mm/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"
Simple merge
Simple merge