UBUNTU: [Config] highbank -- commonise BINFMT settings

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

8 files changed, 2 insertions, 11 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 39aea706b4f..3cf391ad96c 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -36,7 +36,6 @@ CONFIG_BCH=m
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_MISC=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 1094c706f0a..424fe26c229 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -35,8 +35,6 @@ CONFIG_BCH=y
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index f5440cec8cb..6b0005ff32d 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -27,8 +27,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_BCMA is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 85be4b8b29a..31701886169 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -27,8 +27,6 @@ CONFIG_BATMAN_ADV=m
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 53ba65e4196..fc65384b714 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -569,7 +569,9 @@ CONFIG_BE2NET=m
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BEFS_FS=m
 CONFIG_BFS_FS=m
+CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
 CONFIG_BITREVERSE=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_CPQ_CISS_DA=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index af3d8e63f03..b147840ff3a 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -35,8 +35,6 @@ CONFIG_BCH=m
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9539df0baea..79f91796664 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -31,7 +31,6 @@ CONFIG_BCH=m
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_MISC=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index f11bf583814..e490d09fac1 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -34,7 +34,6 @@ CONFIG_BCH=m
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_MISC=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y