diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /arch/xtensa/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index c9b5d298e3c4..2b6257bec4c3 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
| @@ -228,6 +228,8 @@ source "fs/Kconfig.binfmt" | |||
| 228 | 228 | ||
| 229 | endmenu | 229 | endmenu |
| 230 | 230 | ||
| 231 | source "net/Kconfig" | ||
| 232 | |||
| 231 | source "drivers/Kconfig" | 233 | source "drivers/Kconfig" |
| 232 | 234 | ||
| 233 | source "fs/Kconfig" | 235 | source "fs/Kconfig" |