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/parisc/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index ce327c799b44..1c2d87435233 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -190,6 +190,8 @@ source "fs/Kconfig.binfmt" | |||
| 190 | 190 | ||
| 191 | endmenu | 191 | endmenu |
| 192 | 192 | ||
| 193 | source "net/Kconfig" | ||
| 194 | |||
| 193 | source "drivers/Kconfig" | 195 | source "drivers/Kconfig" |
| 194 | 196 | ||
| 195 | source "fs/Kconfig" | 197 | source "fs/Kconfig" |