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/sh/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index a7c8bfc11604..adc8109f8b77 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -784,6 +784,8 @@ config EMBEDDED_RAMDISK_IMAGE | |||
| 784 | 784 | ||
| 785 | endmenu | 785 | endmenu |
| 786 | 786 | ||
| 787 | source "net/Kconfig" | ||
| 788 | |||
| 787 | source "drivers/Kconfig" | 789 | source "drivers/Kconfig" |
| 788 | 790 | ||
| 789 | source "fs/Kconfig" | 791 | source "fs/Kconfig" |