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

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / mthca / mthca_dev.h

diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 15aa32eb78b6b6b093c42e8f419448d042a4596d..7bbdd1f4e6c708c14ee3dc0ab031c64b24140779 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -60,13 +60,12 @@
 enum {
        MTHCA_FLAG_DDR_HIDDEN = 1 << 1,
        MTHCA_FLAG_SRQ        = 1 << 2,
-       MTHCA_FLAG_MSI        = 1 << 3,
-       MTHCA_FLAG_MSI_X      = 1 << 4,
-       MTHCA_FLAG_NO_LAM     = 1 << 5,
-       MTHCA_FLAG_FMR        = 1 << 6,
-       MTHCA_FLAG_MEMFREE    = 1 << 7,
-       MTHCA_FLAG_PCIE       = 1 << 8,
-       MTHCA_FLAG_SINAI_OPT  = 1 << 9
+       MTHCA_FLAG_MSI_X      = 1 << 3,
+       MTHCA_FLAG_NO_LAM     = 1 << 4,
+       MTHCA_FLAG_FMR        = 1 << 5,
+       MTHCA_FLAG_MEMFREE    = 1 << 6,
+       MTHCA_FLAG_PCIE       = 1 << 7,
+       MTHCA_FLAG_SINAI_OPT  = 1 << 8
 };
 
 enum {