diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/cris | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 07335e719bf8..b17aeea8d620 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -679,6 +679,8 @@ source "fs/Kconfig" | |||
| 679 | 679 | ||
| 680 | source "drivers/usb/Kconfig" | 680 | source "drivers/usb/Kconfig" |
| 681 | 681 | ||
| 682 | source "drivers/uwb/Kconfig" | ||
| 683 | |||
| 682 | source "arch/cris/Kconfig.debug" | 684 | source "arch/cris/Kconfig.debug" |
| 683 | 685 | ||
| 684 | source "security/Kconfig" | 686 | source "security/Kconfig" |