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/sparc64/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
| download | kernel_samsung_aries-99ad25a313bda566a346b46a6015afa65bc0a02b.zip kernel_samsung_aries-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.gz kernel_samsung_aries-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.bz2 | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sparc64/Kconfig')
| -rw-r--r-- | arch/sparc64/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 6a47336..9afd28e 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -525,6 +525,8 @@ source "mm/Kconfig" endmenu +source "net/Kconfig" + source "drivers/base/Kconfig" source "drivers/video/Kconfig" @@ -551,7 +553,7 @@ endif source "drivers/ieee1394/Kconfig" -source "net/Kconfig" +source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" @@ -647,6 +649,8 @@ source "drivers/input/Kconfig" source "drivers/i2c/Kconfig" +source "drivers/hwmon/Kconfig" + source "fs/Kconfig" source "drivers/media/Kconfig" |