diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-30 14:37:43 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-30 14:37:43 +1000 |
commit | bdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch) | |
tree | dc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /arch/v850/Kconfig | |
parent | 836cf0465c422ee6d654060edd7c620d9cf0c09c (diff) | |
parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
download | kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.xz kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip |
Merge ../linux-2.6/
Diffstat (limited to 'arch/v850/Kconfig')
-rw-r--r-- | arch/v850/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index 27febd6ffa8..89c053b6c2c 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig @@ -250,6 +250,8 @@ source "fs/Kconfig.binfmt" endmenu +source "net/Kconfig" + ############################################################################# source "drivers/base/Kconfig" @@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig" source "drivers/message/i2o/Kconfig" -source "net/Kconfig" +source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" |