UBUNTU: [Config] highbank -- commonise DM settings

Signed-off-by: Andy Whitcroft <apw@canonical.com>

9 files changed, 5 insertions, 30 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 3cf391ad96c..eb3db269fa7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -64,11 +64,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
 CONFIG_DM_RAID45=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 424fe26c229..18cd1f12fd8 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -66,11 +66,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_RAID45 is not set
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DVB_FE_CUSTOMISE=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 355123fe262..529f5f63cec 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -16,6 +16,7 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_DEBUG_INFO=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+# CONFIG_DM_RAID45 is not set
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_FAT_FS=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 6b0005ff32d..cbeab595154 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -51,11 +51,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DM_MULTIPATH is not set
-CONFIG_DM_RAID45=m
-# CONFIG_DM_THIN_PROVISIONING is not set
-# CONFIG_DM_UEVENT is not set
-# CONFIG_DM_ZERO is not set
 # CONFIG_DNET is not set
 # CONFIG_DRM is not set
 # CONFIG_DW_DMAC is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 31701886169..80eb23c7470 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -51,11 +51,6 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
-# CONFIG_DM_RAID45 is not set
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DW_DMAC=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fc65384b714..dc0900e9761 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1314,12 +1314,16 @@ CONFIG_DM_CRYPT=m
 # CONFIG_DM_FLAKEY is not set
 # CONFIG_DM_LOG_USERSPACE is not set
 CONFIG_DM_MIRROR=m
+CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_RAID=m
 CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
+CONFIG_DM_ZERO=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index b147840ff3a..a6e37ee36de 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -63,11 +63,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
 CONFIG_DM_RAID45=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 79f91796664..65fc33ef852 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -57,11 +57,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_RAID45 is not set
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index e490d09fac1..4ac03ab7845 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -62,11 +62,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_RAID45 is not set
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
 CONFIG_DNET=m
 CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set