---

yaml --- r: 355015 b: refs/heads/master c: fce8a7b h: refs/heads/master i: 355013: fecba25 355011: e28ad76 355007: 7a33d2e v: v3
git-mirror · Jan 18, 2013 · 25c9d9d · 25c9d9d
1 parent 6e818ca
commit 25c9d9d
Show file tree

Hide file tree

Showing 11 changed files with 3,013 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea8a83a4b718f78a8ea2ce3f0237e78a23f8f12b
+refs/heads/master: fce8a7bb5b4bfb8a27324703fd5b002ee9247e90
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5394,6 +5394,12 @@ S:	Maintained
 F:	Documentation/scsi/NinjaSCSI.txt
 F:	drivers/scsi/nsp32*
 
+NTB DRIVER
+M:	Jon Mason <jon.mason@intel.com>
+S:	Supported
+F:	drivers/ntb/
+F:	include/linux/ntb.h
+
 NTFS FILESYSTEM
 M:	Anton Altaparmakov <anton@tuxera.com>
 L:	linux-ntfs-dev@lists.sourceforge.net

diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -150,6 +150,8 @@ source "drivers/memory/Kconfig"
 
 source "drivers/iio/Kconfig"
 
+source "drivers/ntb/Kconfig"
+
 source "drivers/vme/Kconfig"
 
 source "drivers/pwm/Kconfig"

diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
@@ -146,3 +146,4 @@ obj-$(CONFIG_MEMORY)		+= memory/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_VME_BUS)		+= vme/
 obj-$(CONFIG_IPACK_BUS)		+= ipack/
+obj-$(CONFIG_NTB)		+= ntb/
diff --git a/trunk/drivers/ntb/Kconfig b/trunk/drivers/ntb/Kconfig
@@ -0,0 +1,13 @@
+config NTB
+       tristate "Intel Non-Transparent Bridge support"
+       depends on PCI
+       depends on X86
+       help
+        The PCI-E Non-transparent bridge hardware is a point-to-point PCI-E bus
+        connecting 2 systems.  When configured, writes to the device's PCI
+        mapped memory will be mirrored to a buffer on the remote system.  The
+        ntb Linux driver uses this point-to-point communication as a method to
+        transfer data from one system to the other.
+
+        If unsure, say N.
+
diff --git a/trunk/drivers/ntb/Makefile b/trunk/drivers/ntb/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_NTB) += ntb.o
+
+ntb-objs := ntb_hw.o ntb_transport.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		obj-$(CONFIG_NTB) += ntb.o

		ntb-objs := ntb_hw.o ntb_transport.o