---

yaml --- r: 4909 b: refs/heads/master c: 5420899 h: refs/heads/master i: 4907: 0863727 v: v3
git-mirror · Jul 18, 2005 · 15d4cba · 15d4cba
1 parent 10d2855
commit 15d4cba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ad1ff299dd908d07c5e5f27f88bbdb235eb7a5
+refs/heads/master: 54208991e15fa00e37a9d172ac0d87191a832165
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2549,4 +2549,20 @@ config NETCONSOLE
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
 
+config NETPOLL
+	def_bool NETCONSOLE
+
+config NETPOLL_RX
+	bool "Netpoll support for trapping incoming packets"
+	default n
+	depends on NETPOLL
+
+config NETPOLL_TRAP
+	bool "Netpoll traffic trapping"
+	default n
+	depends on NETPOLL
+
+config NET_POLL_CONTROLLER
+	def_bool NETPOLL
+
 endmenu
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
@@ -209,22 +209,6 @@ endmenu
 
 endmenu
 
-config NETPOLL
-	def_bool NETCONSOLE
-
-config NETPOLL_RX
-	bool "Netpoll support for trapping incoming packets"
-	default n
-	depends on NETPOLL
-
-config NETPOLL_TRAP
-	bool "Netpoll traffic trapping"
-	default n
-	depends on NETPOLL
-
-config NET_POLL_CONTROLLER
-	def_bool NETPOLL
-
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"