diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /arch/ia64 | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 01b78e7f992e..2e08942339ad 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -423,6 +423,8 @@ endmenu | |||
| 423 | 423 | ||
| 424 | endif | 424 | endif |
| 425 | 425 | ||
| 426 | source "net/Kconfig" | ||
| 427 | |||
| 426 | source "drivers/Kconfig" | 428 | source "drivers/Kconfig" |
| 427 | 429 | ||
| 428 | source "fs/Kconfig" | 430 | source "fs/Kconfig" |