UBUNTU: [Config] s390x -- disable CONFIG_NET_VENDOR_SYNOPSYS

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

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

@@ -251,6 +251,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

debian.master/config/annotations

@@ -4108,10 +4108,8 @@ CONFIG_WIZNET_W5100                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_WIZNET_W5300                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_NET_VENDOR_XIRCOM                        policy<{'amd64': 'y', 'i386': 'y', 'powerpc': 'y'}>
 CONFIG_PCMCIA_XIRC2PS                           policy<{'amd64': 'm', 'i386': 'm', 'powerpc': 'm'}>
-CONFIG_NET_VENDOR_SYNOPSYS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_NET_VENDOR_SYNOPSYS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_SYNOPSYS_DWC_ETH_QOS                     policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-#
-CONFIG_NET_VENDOR_SYNOPSYS			flag<REVIEW> note<check s390x>
 
 # Menu: Device Drivers >> Network device support >> Ethernet driver support >> 3Com devices
 CONFIG_NET_VENDOR_3COM                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>

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

@@ -253,6 +253,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

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

@@ -245,6 +245,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

debian.master/config/config.common.ubuntu

@@ -5128,7 +5128,6 @@ CONFIG_NET_VENDOR_IBM=y
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICROCHIP=y
 CONFIG_NET_VENDOR_PASEMI=y
-CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TOSHIBA=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_NET_VENDOR_XIRCOM=y

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

@@ -249,6 +249,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

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

@@ -242,6 +242,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

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

@@ -266,6 +266,7 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y

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

@@ -212,6 +212,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set