diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
| commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
| tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /arch/arm/mach-prima2/Kconfig | |
| parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
| parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
| download | op-kernel-dev-f6a74a5e15df32f289837feeabf8c84829312b06.zip op-kernel-dev-f6a74a5e15df32f289837feeabf8c84829312b06.tar.gz | |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-prima2/Kconfig')
| -rw-r--r-- | arch/arm/mach-prima2/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index e03d8b5..9ab8932 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -4,6 +4,7 @@ menuconfig ARCH_SIRF select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP select NO_IOPORT_MAP + select REGMAP select PINCTRL select PINCTRL_SIRF help |
