diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
| commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
| tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /arch/arm/mach-hisi/Kconfig | |
| parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
| parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
| download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip | |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'arch/arm/mach-hisi/Kconfig')
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index 8f4649b301b2..1abae5f6a418 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -8,7 +8,7 @@ config ARCH_HI3xxx select CLKSRC_OF select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU - select HAVE_ARM_TWD + select HAVE_ARM_TWD if SMP select HAVE_SMP select PINCTRL select PINCTRL_SINGLE |