UBUNTU: [Config] s390x -- disable CONFIG_NVMEM

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

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

@@ -265,6 +265,7 @@ CONFIG_NR_ZONES_EXTENDED=y
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set

debian.master/config/annotations

@@ -3919,7 +3919,7 @@ CONFIG_ND_BLK                                   policy<{'amd64': 'm', 'arm64': '
 CONFIG_BTT                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'powerpc-powerpc64-emb': 'y', 'powerpc-powerpc64-smp': 'y', 'powerpc-powerpc-e500mc': 'y', 'ppc64el': 'y'}>
 
 # Menu: Device Drivers >> NVMEM Support
-CONFIG_NVMEM                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NVMEM                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_QCOM_QFPROM                              policy<{'arm64': 'm', 'armhf': 'm'}>
 #
 CONFIG_NVMEM					flag<REVIEW> note<Q: is this appropriate for s390x>

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

@@ -264,6 +264,7 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=128
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m

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

@@ -257,6 +257,7 @@ CONFIG_NR_CPUS=4
 # CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y

debian.master/config/config.common.ubuntu

@@ -5381,7 +5381,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVM=y
-CONFIG_NVMEM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_VF610_OCOTP=m
 # CONFIG_NVM_DEBUG is not set

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

@@ -261,6 +261,7 @@ CONFIG_NR_CPUS=8
 # CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set

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

@@ -254,6 +254,7 @@ CONFIG_NOZOMI=m
 # CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y

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

@@ -280,6 +280,7 @@ CONFIG_NR_CPUS=2048
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m

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

@@ -225,6 +225,7 @@ CONFIG_NR_CPUS=256
 # CONFIG_NTB is not set
 CONFIG_NTFS_RW=y
 CONFIG_NUMA=y
+# CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set
 # CONFIG_OMFS_FS is not set