[PATCH] UBUNTU: [Config] Enable CONFIG_DEVPTS_MULTIPLE_INSTANCES for highbank

[Ike Panhc]

BugLink: http://launchpad.net/bugs/1038259

Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 -
 debian.master/config/armel/config.common.armel     |    1 -
 debian.master/config/armhf/config.flavour.highbank |    1 -
 debian.master/config/armhf/config.flavour.omap     |    1 -
 debian.master/config/config.common.ubuntu          |    1 +
 debian.master/config/i386/config.common.i386       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 -
 debian.master/config/ppc64/config.common.ppc64     |    1 -
 8 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 066d84a..d2bc0a1 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -49,7 +49,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM9000 is not set
 CONFIG_DM_RAID45=m
 CONFIG_DRM_PSB=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index d6806ad..6bb8860 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -46,7 +46,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
 # CONFIG_DM_RAID45 is not set
 CONFIG_DVB_FE_CUSTOMISE=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 0dc8805..5e74244 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -29,7 +29,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DW_DMAC is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index c20a297..eb6ea29 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -29,7 +29,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DW_DMAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bcc53f6..5d5bf6a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1230,6 +1230,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVPORT=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEV_APPLETALK=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e8bfd93..89aa1d8 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -49,7 +49,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM9000 is not set
 CONFIG_DM_RAID45=m
 CONFIG_DRM_PSB=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index e337680..fe71e97 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -43,7 +43,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM9000 is not set
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DRM_PSB is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index e331195..ef04963 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -49,7 +49,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM9000 is not set
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DRM_PSB is not set
-- 
1.7.9.5