summaryrefslogtreecommitdiff
path: root/arch/microblaze/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-28 21:04:11 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-28 21:04:11 +0400
commit627f4b3ee3899bb70263ee77454a43c73136562f (patch)
tree0464b4d97b462991e4f3458a9daa3665eaeb6f63 /arch/microblaze/Kconfig
parente770d73ceb93c235525cb9bbbf1374c9b61a0895 (diff)
parentc0d68cea2db34a510f4d67b90aab1c48bc47461e (diff)
downloadlinux-627f4b3ee3899bb70263ee77454a43c73136562f.tar.xz
Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze patches from Michal Simek: - add CCF support - fix BS=0 compilation - wire up defconfig - some minor cleanups and fixes * tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Add missing v8.50.a version microblaze: Fix missing bracket in printk microblaze: Fix compilation error for BS=0 microblaze: Disable stack protection from bootloader microblaze: Define read/write{b,w,l}_relaxed MMIO microblaze: timer: Do not initialized system timer twice microblaze: timer: Use generic sched_clock implementation microblaze: Add NOTES section to linker script microblaze: Add support for CCF microblaze: Simplify fcpu helper function microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h> microblaze: Remove duplicate declarations of _stext[] and _etext[] microblaze: Remove _fdt_start casts microblaze: Wire up defconfig to mmu_defconfig
Diffstat (limited to 'arch/microblaze/Kconfig')
-rw-r--r--arch/microblaze/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 8d581ab06c5d..79b9bcdfe498 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -26,6 +26,8 @@ config MICROBLAZE
select GENERIC_CPU_DEVICES
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
+ select COMMON_CLK
+ select GENERIC_SCHED_CLOCK
select GENERIC_IDLE_POLL_SETUP
select MODULES_USE_ELF_RELA
select CLONE_BACKWARDS3