diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/microblaze/Kconfig.debug | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/microblaze/Kconfig.debug')
| -rw-r--r-- | arch/microblaze/Kconfig.debug | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig.debug b/arch/microblaze/Kconfig.debug index 242cd35bdb4b..9dc708a7f700 100644 --- a/arch/microblaze/Kconfig.debug +++ b/arch/microblaze/Kconfig.debug | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | menu "Kernel hacking" | 4 | menu "Kernel hacking" |
| 5 | 5 | ||
| 6 | config TRACE_IRQFLAGS_SUPPORT | ||
| 7 | def_bool y | ||
| 8 | |||
| 6 | source "lib/Kconfig.debug" | 9 | source "lib/Kconfig.debug" |
| 7 | 10 | ||
| 8 | config EARLY_PRINTK | 11 | config EARLY_PRINTK |