diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /arch/microblaze/Kconfig | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 6c4fee5eaf0b..206222a13a23 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -5,7 +5,7 @@ mainmenu "Linux/Microblaze Kernel Configuration" | |||
| 5 | 5 | ||
| 6 | config MICROBLAZE | 6 | config MICROBLAZE |
| 7 | def_bool y | 7 | def_bool y |
| 8 | select HAVE_LMB | 8 | select HAVE_MEMBLOCK |
| 9 | select HAVE_FUNCTION_TRACER | 9 | select HAVE_FUNCTION_TRACER |
| 10 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | 10 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST |
| 11 | select HAVE_FUNCTION_GRAPH_TRACER | 11 | select HAVE_FUNCTION_GRAPH_TRACER |