Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ffc7a0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 2824bd25 f4637b55

arch/alpha/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -596,6 +596,8 @@ source "fs/Kconfig.binfmt" 


endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -700,6 +700,8 @@ config APM 


endmenu



source "net/Kconfig"



menu "Device Drivers"



source "drivers/base/Kconfig"
@@ -732,7 +734,7 @@ source "drivers/ieee1394/Kconfig" 


source "drivers/message/i2o/Kconfig"



source "net/Kconfig"

source "drivers/net/Kconfig"



source "drivers/isdn/Kconfig"

arch/arm26/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ source "mm/Kconfig" 


endmenu



source "net/Kconfig"



source "drivers/base/Kconfig"



source "drivers/parport/Kconfig"
@@ -193,7 +195,7 @@ source "drivers/block/Kconfig" 


source "drivers/md/Kconfig"



source "net/Kconfig"

source "drivers/net/Kconfig"



source "drivers/ide/Kconfig"

arch/cris/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig 


endmenu



source "net/Kconfig"



# bring in ETRAX built-in drivers

menu "Drivers for built-in interfaces"

source arch/cris/arch-v10/drivers/Kconfig
@@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig" 


source "drivers/message/i2o/Kconfig"



source "net/Kconfig"

source "drivers/net/Kconfig"



source "drivers/isdn/Kconfig"

arch/frv/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -346,6 +346,8 @@ source "fs/Kconfig.binfmt" 


endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"