UBUNTU: [Config] s390x -- disable CONFIG_NET_VENDOR_EMULEX

BugLink: http://bugs.launchpad.net/bugs/1543165Signed-off-by: Andy Whitcroft <apw@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -227,6 +227,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/annotations

@@ -4039,7 +4039,7 @@ CONFIG_NET_VENDOR_DLINK                         policy<{'amd64': 'y', 'arm64': '
 CONFIG_DL2K                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_SUNDANCE                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_SUNDANCE_MMIO                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
-CONFIG_NET_VENDOR_EMULEX                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_NET_VENDOR_EMULEX                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_BE2NET                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BE2NET_HWMON                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_BE2NET_VXLAN                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>

debian.master/config/arm64/config.common.arm64

@@ -229,6 +229,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/armhf/config.common.armhf

@@ -221,6 +221,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/config.common.ubuntu

@@ -5119,7 +5119,6 @@ CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_APPLE=y
 CONFIG_NET_VENDOR_AURORA=y
 CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_FARADAY=y
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_NET_VENDOR_FUJITSU=y

debian.master/config/i386/config.common.i386

@@ -225,6 +225,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/powerpc/config.common.powerpc

@@ -218,6 +218,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/ppc64el/config.common.ppc64el

@@ -242,6 +242,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HP=y

debian.master/config/s390x/config.common.s390x

@@ -188,6 +188,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_HP is not set