Merge for-next omap-testing cbus

diff --cc arch/arm/Kconfig
index db524e75c4a21e4f45bc4b72e459adcdaf1dda4b,a19a5266d5fc989327d2f5e82b8068e13462a5b8,e51b96e9ae52b3a8f985ca175fa6a8518e8e26ed..dd944bdaf884f8a7295abb0268a9af3896b18c9a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -686,13 -686,13 -684,12 +686,13 @@@@ config ARCH_S5P64X
        select CPU_V6
        select GENERIC_GPIO
        select HAVE_CLK
 --     select HAVE_S3C2410_WATCHDOG
 ++     select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select ARCH_USES_GETTIMEOFFSET
 --     select HAVE_S3C2410_I2C
 --     select HAVE_S3C_RTC
 ++     select HAVE_S3C2410_I2C if I2C
 ++     select HAVE_S3C_RTC if RTC_CLASS
        help
  -       Samsung S5P6440 CPU based systems
  +       Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
  +       SMDK6450.
   
   config ARCH_S5P6442
        bool "Samsung S5P6442"
@@@@ -724,11 -724,11 -720,10 +724,11 @@@@ config ARCH_S5PV21
        select GENERIC_GPIO
        select HAVE_CLK
        select ARM_L1_CACHE_SHIFT_6
  +     select ARCH_HAS_CPUFREQ
        select ARCH_USES_GETTIMEOFFSET
 --     select HAVE_S3C2410_I2C
 --     select HAVE_S3C_RTC
 --     select HAVE_S3C2410_WATCHDOG
 ++     select HAVE_S3C2410_I2C if I2C
 ++     select HAVE_S3C_RTC if RTC_CLASS
 ++     select HAVE_S3C2410_WATCHDOG if WATCHDOG
        help
          Samsung S5PV210/S5PC110 series based systems
   
@@@@ -739,9 -739,9 -733,6 +739,9 @@@@ config ARCH_S5PV31
        select GENERIC_GPIO
        select HAVE_CLK
        select GENERIC_CLOCKEVENTS
 -      select HAVE_S3C_RTC
 -      select HAVE_S3C2410_I2C
 -      select HAVE_S3C2410_WATCHDOG
 ++     select HAVE_S3C_RTC if RTC_CLASS
 ++     select HAVE_S3C2410_I2C if I2C
 ++     select HAVE_S3C2410_WATCHDOG if WATCHDOG
        help
          Samsung S5PV310 series based systems
   

diff --cc arch/arm/mach-omap1/board-nokia770.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n8x0.c
Simple merge

diff --cc drivers/Makefile
Simple merge