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/arm/Kconfig | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8752751f9985..45462714caf1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -700,6 +700,8 @@ config APM | |||
| 700 | 700 | ||
| 701 | endmenu | 701 | endmenu |
| 702 | 702 | ||
| 703 | source "net/Kconfig" | ||
| 704 | |||
| 703 | menu "Device Drivers" | 705 | menu "Device Drivers" |
| 704 | 706 | ||
| 705 | source "drivers/base/Kconfig" | 707 | source "drivers/base/Kconfig" |
| @@ -732,7 +734,7 @@ source "drivers/ieee1394/Kconfig" | |||
| 732 | 734 | ||
| 733 | source "drivers/message/i2o/Kconfig" | 735 | source "drivers/message/i2o/Kconfig" |
| 734 | 736 | ||
| 735 | source "net/Kconfig" | 737 | source "drivers/net/Kconfig" |
| 736 | 738 | ||
| 737 | source "drivers/isdn/Kconfig" | 739 | source "drivers/isdn/Kconfig" |
| 738 | 740 | ||