diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /arch/microblaze/Kconfig | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
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 fd53e500be67..cd5837e298b2 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -90,7 +90,7 @@ source "arch/microblaze/platform/Kconfig.platform" | |||
| 90 | 90 | ||
| 91 | menu "Processor type and features" | 91 | menu "Processor type and features" |
| 92 | 92 | ||
| 93 | source kernel/time/Kconfig | 93 | source "kernel/time/Kconfig" |
| 94 | 94 | ||
| 95 | source "kernel/Kconfig.preempt" | 95 | source "kernel/Kconfig.preempt" |
| 96 | 96 | ||