[PATCH 2/9] UBUNTU: [Config] enable CONFIG_I2C_HELPER_AUTO for all flavours as policy expects

[Bryan Wu]

Signed-off-by: Bryan Wu <bryan.wu 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          | 2 +-
 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(+), 8 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 50f5a80..5432c02 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -85,7 +85,6 @@ CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_IDE is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INLINE_READ_UNLOCK=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 93b1787..eedf0a3 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -91,7 +91,6 @@ CONFIG_HW_RANDOM_ATMEL=m
 CONFIG_HZ=128
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
-# CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 373c642..0fda789 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -50,7 +50,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_HVC_DCC is not set
 CONFIG_HZ=100
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_INLINE_READ_UNLOCK is not set
 # CONFIG_INLINE_READ_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index b4e99fe..b375ffb 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -50,7 +50,6 @@ CONFIG_HTC_I2CPLD=y
 CONFIG_HVC_DCC=y
 CONFIG_HZ=128
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
-# CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4662ccd..0704f59 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2263,7 +2263,6 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 CONFIG_I2C=y
 CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ALI1535=m
 CONFIG_I2C_ALI1563=m
 CONFIG_I2C_ALI15X3=m
@@ -2280,6 +2279,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_EG20T=m
 CONFIG_I2C_GPIO=m
+CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HYDRA=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_INTEL_MID=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0cbba85..1bf5ced 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -84,7 +84,6 @@ CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_IDE is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INLINE_READ_UNLOCK=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index c363e73..ddefe3c 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -74,7 +74,6 @@ CONFIG_HTC_I2CPLD=y
 # CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_IBMEBUS is not set
 # CONFIG_IDE is not set
 CONFIG_INLINE_READ_UNLOCK=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index f6dd766..64f0806 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -86,7 +86,6 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_HVC_CONSOLE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_HELPER_AUTO=y
 CONFIG_IBMEBUS=y
 CONFIG_IDE=y
 CONFIG_INLINE_READ_UNLOCK=y
-- 
1.7.11.1