| Message ID | ce73e8bf4610b187adad07a3993e861f21004478.1282150973.git.leann.ogasawara@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 8e158b3..7bf8651 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1450,6 +1450,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y # CONFIG_INFINIBAND_NES is not set +CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_USER_MEM=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=32 diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index 3bd5fcc..d443f68 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -107,7 +107,6 @@ CONFIG_IKCONFIG=y # CONFIG_INFINIBAND_IPATH is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_ISER is not set -CONFIG_INFINIBAND_QIB=m # CONFIG_INFINIBAND_SRP is not set # CONFIG_INFINIBAND_USER_ACCESS is not set # CONFIG_INFINIBAND_USER_MAD is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index a0856f6..048f455 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -95,7 +95,6 @@ CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_IPATH is not set CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index ee219bf..62e10dd 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -108,7 +108,6 @@ CONFIG_INFINIBAND_AMSO1100=m CONFIG_INFINIBAND_IPATH=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_ISER=m -# CONFIG_INFINIBAND_QIB is not set CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m
This reverts commit 09f58c1e8530e630a1dcf241c9e75094b6f86d3a. sparc is being decommissioned so drop this patch. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-)