diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (patch) | |
| tree | ca8654a286f61da917318645cab9e061095ecdba /arch/arm/mach-vt8500/Kconfig | |
| parent | a94d236dc355f374857ee4e6e78b7dec8a0f29e3 (diff) | |
| parent | f31c2f1c68aff83277eddc6798adf3438e9c680a (diff) | |
Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Diffstat (limited to 'arch/arm/mach-vt8500/Kconfig')
| -rw-r--r-- | arch/arm/mach-vt8500/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index e3e94b2fa145..9b252934b206 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig | |||
| @@ -7,6 +7,7 @@ config ARCH_VT8500 | |||
| 7 | select GENERIC_CLOCKEVENTS | 7 | select GENERIC_CLOCKEVENTS |
| 8 | select HAVE_CLK | 8 | select HAVE_CLK |
| 9 | select VT8500_TIMER | 9 | select VT8500_TIMER |
| 10 | select PINCTRL | ||
| 10 | help | 11 | help |
| 11 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. | 12 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. |
| 12 | 13 | ||