---

yaml --- r: 355016 b: refs/heads/master c: 548c237 h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · 87ba733 · 87ba733
1 parent 25c9d9d
commit 87ba733
Show file tree

Hide file tree

Showing 5 changed files with 426 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fce8a7bb5b4bfb8a27324703fd5b002ee9247e90
+refs/heads/master: 548c237c0a9972df5d1afaca38aa733ee577128d
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5398,6 +5398,7 @@ NTB DRIVER
 M:	Jon Mason <jon.mason@intel.com>
 S:	Supported
 F:	drivers/ntb/
+F:	drivers/net/ntb_netdev.c
 F:	include/linux/ntb.h
 
 NTFS FILESYSTEM

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -189,6 +189,10 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
 	def_bool NETPOLL
 
+config NTB_NETDEV
+	tristate "Virtual Ethernet over NTB"
+	depends on NTB
+
 config RIONET
 	tristate "RapidIO Ethernet over messaging driver support"
 	depends on RAPIDIO

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -71,3 +71,4 @@ obj-$(CONFIG_USB_IPHETH)        += usb/
 obj-$(CONFIG_USB_CDC_PHONET)   += usb/
 
 obj-$(CONFIG_HYPERV_NET) += hyperv/
+obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,3 +71,4 @@ obj-$(CONFIG_USB_IPHETH) += usb/
		obj-$(CONFIG_USB_CDC_PHONET) += usb/

		obj-$(CONFIG_HYPERV_NET) += hyperv/
		obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o