diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
tree | 4d4353bb6535aec7822ea71e594154979728e484 /arch/m32r/Kconfig | |
parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
download | op-kernel-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip op-kernel-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/m32r/Kconfig')
-rw-r--r-- | arch/m32r/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 42ca8a3..7772951 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -359,6 +359,8 @@ source "fs/Kconfig.binfmt" endmenu +source "net/Kconfig" + source "drivers/Kconfig" source "fs/Kconfig" |