diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /arch/ia64/Kconfig | |
parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
download | linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.gz linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.bz2 linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index bfdd062dd82..cbb3e0cef93 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -416,6 +416,8 @@ endmenu endif +source "net/Kconfig" + source "drivers/Kconfig" source "fs/Kconfig" |