Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-block.git] / drivers / ntb / hw / intel / ntb_hw_intel.h

diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.h b/drivers/ntb/hw/intel/ntb_hw_intel.h
index ea0612f797df61e9087b101df592d61c9d33e1ef..2eb4addd10d082c03184469619b6bafece08ddde 100644 (file)
--- a/drivers/ntb/hw/intel/ntb_hw_intel.h
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.h
@@ -227,16 +227,11 @@
 
 /* Use the following addresses for translation between b2b ntb devices in case
  * the hardware default values are not reliable. */
-#define XEON_B2B_BAR0_USD_ADDR         0x1000000000000000ull
-#define XEON_B2B_BAR2_USD_ADDR64       0x2000000000000000ull
-#define XEON_B2B_BAR4_USD_ADDR64       0x4000000000000000ull
-#define XEON_B2B_BAR4_USD_ADDR32       0x20000000u
-#define XEON_B2B_BAR5_USD_ADDR32       0x40000000u
-#define XEON_B2B_BAR0_DSD_ADDR         0x9000000000000000ull
-#define XEON_B2B_BAR2_DSD_ADDR64       0xa000000000000000ull
-#define XEON_B2B_BAR4_DSD_ADDR64       0xc000000000000000ull
-#define XEON_B2B_BAR4_DSD_ADDR32       0xa0000000u
-#define XEON_B2B_BAR5_DSD_ADDR32       0xc0000000u
+#define XEON_B2B_BAR0_ADDR     0x1000000000000000ull
+#define XEON_B2B_BAR2_ADDR64   0x2000000000000000ull
+#define XEON_B2B_BAR4_ADDR64   0x4000000000000000ull
+#define XEON_B2B_BAR4_ADDR32   0x20000000u
+#define XEON_B2B_BAR5_ADDR32   0x40000000u
 
 /* The peer ntb secondary config space is 32KB fixed size */
 #define XEON_B2B_MIN_SIZE              0x8000