diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 21:15:43 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 21:15:43 +0200 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /arch/alpha/Kconfig | |
parent | [IA64] Make PCDP work again. (diff) | |
parent | [PATCH] inotify: misc cleanup (diff) | |
download | linux-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.xz linux-99ad25a313bda566a346b46a6015afa65bc0a02b.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/alpha/Kconfig')
-rw-r--r-- | arch/alpha/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index c5739d6309df..083c5df42d35 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -596,6 +596,8 @@ source "fs/Kconfig.binfmt" endmenu +source "net/Kconfig" + source "drivers/Kconfig" source "fs/Kconfig" |