From patchwork Mon Jul  9 08:08:37 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/2] UBUNTU: [Config] sync CONFIG_MOUSE_PS2_ config for all flavours
Date: Sun, 08 Jul 2012 22:08:37 -0000
From: Bryan Wu <bryan.wu@canonical.com>
X-Patchwork-Id: 169709
Message-Id: <1341821317-5173-3-git-send-email-bryan.wu@canonical.com>
To: tim.gardner@canonical.com, apw@canonical.com, kernel-team@lists.ubuntu.com

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>


diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 94dbf74..e10c77f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -155,8 +155,6 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 124cb80..757cfcb 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -164,8 +164,6 @@ CONFIG_MMC_SDHCI_PXAV2=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 8c779df..d85a5d5 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -113,8 +113,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 03a5069..4632890 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -113,8 +113,6 @@ CONFIG_MMC_SDHCI_PXAV2=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 31f092f..e74af4e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3303,10 +3303,12 @@ CONFIG_MOUSE_LOGIBM=m
 CONFIG_MOUSE_PC110PAD=m
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 5224147..282c79d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -154,8 +154,6 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 360429b..75114b1 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -144,8 +144,6 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 174854b..eb68659 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -160,8 +160,6 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMIO_NVRAM=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MPIC_U3_HT_IRQS=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m