diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-08 12:24:08 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-08 12:24:08 -0500 |
| commit | 8800113cafc11291a2ae1370cb87727629b76301 (patch) | |
| tree | b2c9f8be1f6efbd48dd1b5ec1cef7820b2d2c1f0 /arch/microblaze | |
| parent | 24a50b811efee77169bc82f2e4598d5b69441996 (diff) | |
| parent | 82fc0deb5fb5067c5207ace309b4e3af3eeec17b (diff) | |
Merge branch 'lsk-v3.14-15.03-rt' into linux-linaro-lng-v3.14-rt
Conflicts:
include/linux/cpuset.h
kernel/cpuset.c
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 79b9bcdfe498..d618d3633122 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -1,5 +1,6 @@ config MICROBLAZE def_bool y + select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP |