diff options
author | Andy Whitcroft <apw@canonical.com> | 2012-06-01 15:11:07 +0100 |
---|---|---|
committer | Andy Whitcroft <apw@canonical.com> | 2012-06-01 15:37:13 +0100 |
commit | 6a9967c789fa0df77d75b5c113960b106fd84e33 (patch) | |
tree | c6d1daab433bfb125f7cbfe277d8201bac8eb8f9 | |
parent | 464dd48e090e940009b84d93e7ee7bf1a338437c (diff) |
UBUNTU: [Config] highbank -- commonise KEYBOARD/MOUSE settings
Disable:
CONFIG_KEYBOARD_SAMSUNG
Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 15 | ||||
-rw-r--r-- | debian.master/config/armel/config.common.armel | 16 | ||||
-rw-r--r-- | debian.master/config/armhf/config.flavour.highbank | 16 | ||||
-rw-r--r-- | debian.master/config/armhf/config.flavour.omap | 16 | ||||
-rw-r--r-- | debian.master/config/config.common.ubuntu | 16 | ||||
-rw-r--r-- | debian.master/config/i386/config.common.i386 | 15 | ||||
-rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 16 | ||||
-rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 16 |
8 files changed, 16 insertions, 110 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 7a6caf55c51..2b48848c6c0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -188,21 +188,6 @@ CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KGDB=y CONFIG_KPROBES=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 1c8d398760f..deb5524c975 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -190,23 +190,7 @@ CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_SAMSUNG=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TWL4030=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KGDB=y CONFIG_KPROBES=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 74e51d36119..eb8731ca5fe 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -148,23 +148,7 @@ CONFIG_IP_PNP=y # CONFIG_JFS_STATISTICS is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_KEXEC is not set -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TWL4030 is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KPROBES is not set # CONFIG_KS8842 is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index cd8ffbf3828..90bf30dcaef 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -148,23 +148,7 @@ CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_SAMSUNG=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TWL4030=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KPROBES=y CONFIG_KS8842=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a30ce07a553..611bec2b071 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2744,14 +2744,30 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_JUMP=y CONFIG_KEYBOARD_ADP5520=m +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_HIGHBANK=y +CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_LM8323=m +CONFIG_KEYBOARD_MATRIX=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_OMAP4=m +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_QT1070=m # CONFIG_KEYBOARD_QT2160 is not set CONFIG_KEYBOARD_STMPE=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_TC3589X=m +CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_TWL4030=m CONFIG_KEYS=y CONFIG_KEYS_COMPAT=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index cb36f4f2c0e..51552dbbc8e 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -189,21 +189,6 @@ CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KGDB=y CONFIG_KPROBES=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index cc0305d42be..c83c9f09ce0 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -179,22 +179,6 @@ CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TWL4030=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KPROBES=y CONFIG_KS8842=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index f7325db73df..2d7964b690a 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -190,22 +190,6 @@ CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KEXEC=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TWL4030=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KGDB=y CONFIG_KPROBES=y |