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/sparc64 | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 6a4733683f0f..140607870f13 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -525,6 +525,8 @@ source "mm/Kconfig" | |||
| 525 | 525 | ||
| 526 | endmenu | 526 | endmenu |
| 527 | 527 | ||
| 528 | source "net/Kconfig" | ||
| 529 | |||
| 528 | source "drivers/base/Kconfig" | 530 | source "drivers/base/Kconfig" |
| 529 | 531 | ||
| 530 | source "drivers/video/Kconfig" | 532 | source "drivers/video/Kconfig" |
| @@ -551,7 +553,7 @@ endif | |||
| 551 | 553 | ||
| 552 | source "drivers/ieee1394/Kconfig" | 554 | source "drivers/ieee1394/Kconfig" |
| 553 | 555 | ||
| 554 | source "net/Kconfig" | 556 | source "drivers/net/Kconfig" |
| 555 | 557 | ||
| 556 | source "drivers/isdn/Kconfig" | 558 | source "drivers/isdn/Kconfig" |
| 557 | 559 | ||