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/cris/Kconfig | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index f848e376149..e5979d68e35 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig endmenu +source "net/Kconfig" + # bring in ETRAX built-in drivers menu "Drivers for built-in interfaces" source arch/cris/arch-v10/drivers/Kconfig @@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig" source "drivers/message/i2o/Kconfig" -source "net/Kconfig" +source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" |