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/i386/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/i386/Kconfig')
| -rw-r--r-- | arch/i386/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 6c02336fe2e4..a801d9d48606 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -1285,6 +1285,8 @@ source "fs/Kconfig.binfmt" | |||
| 1285 | 1285 | ||
| 1286 | endmenu | 1286 | endmenu |
| 1287 | 1287 | ||
| 1288 | source "net/Kconfig" | ||
| 1289 | |||
| 1288 | source "drivers/Kconfig" | 1290 | source "drivers/Kconfig" |
| 1289 | 1291 | ||
| 1290 | source "fs/Kconfig" | 1292 | source "fs/Kconfig" |