Merge branch 'depends/cleanup' into next/soc
authorOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 07:03:23 +0000 (23:03 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 07:03:34 +0000 (23:03 -0800)
Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/mach-vt8500/Kconfig
arch/arm/mach-vt8500/vt8500.c

@@@ -6,28 -7,7 +6,29 @@@ config ARCH_VT850
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select HAVE_CLK
+       select VT8500_TIMER
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 +
 +config ARCH_WM8505
 +      bool "VIA/Wondermedia 85xx and WM8650"
 +      depends on ARCH_MULTI_V5
 +      select ARCH_VT8500
 +      select CPU_ARM926T
 +      help
 +
 +config ARCH_WM8750
 +      bool "WonderMedia WM8750"
 +      depends on ARCH_MULTI_V6
 +      select ARCH_VT8500
 +      select CPU_V6
 +      help
 +        Support for WonderMedia WM8750 System-on-Chip.
 +
 +config ARCH_WM8850
 +      bool "WonderMedia WM8850"
 +      depends on ARCH_MULTI_V7
 +      select ARCH_VT8500
 +      select CPU_V7
 +      help
 +        Support for WonderMedia WM8850 System-on-Chip.
Simple merge