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/arm26 | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm26')
| -rw-r--r-- | arch/arm26/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index dc0c1936969b..1f0373267306 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
| @@ -183,6 +183,8 @@ source "mm/Kconfig" | |||
| 183 | 183 | ||
| 184 | endmenu | 184 | endmenu |
| 185 | 185 | ||
| 186 | source "net/Kconfig" | ||
| 187 | |||
| 186 | source "drivers/base/Kconfig" | 188 | source "drivers/base/Kconfig" |
| 187 | 189 | ||
| 188 | source "drivers/parport/Kconfig" | 190 | source "drivers/parport/Kconfig" |
| @@ -193,7 +195,7 @@ source "drivers/block/Kconfig" | |||
| 193 | 195 | ||
| 194 | source "drivers/md/Kconfig" | 196 | source "drivers/md/Kconfig" |
| 195 | 197 | ||
| 196 | source "net/Kconfig" | 198 | source "drivers/net/Kconfig" |
| 197 | 199 | ||
| 198 | source "drivers/ide/Kconfig" | 200 | source "drivers/ide/Kconfig" |
| 199 | 201 | ||