From b51b9af0859102d059fbd2ecf9309af02d27419a Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sat, 19 Jun 2010 19:10:21 +0000 Subject: [PATCH] [armel] Make MOUSE_PS2 modular. svn path=/dists/sid/linux-2.6/; revision=15894 --- debian/changelog | 1 + debian/config/armel/config | 7 +++++++ debian/config/armel/config.iop32x | 9 --------- debian/config/armel/config.ixp4xx | 9 --------- debian/config/armel/config.versatile | 15 --------------- 5 files changed, 8 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index 166a6a13f..420f77e4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ linux-2.6 (2.6.32-16) UNRELEASED; urgency=low * m25p80: Add support for Macronix 25L8005. * Add framebuffer driver for XGI chipsets. * [armel/kirkwood] Enable FB_XGI and FRAMEBUFFER_CONSOLE. + * [armel] Make MOUSE_PS2 modular. [ Bastian Blank ] * Disable mISDN support for NETJet cards. The driver binds a generic PCI diff --git a/debian/config/armel/config b/debian/config/armel/config index 04f5d7c54..153ca5a53 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -87,3 +87,10 @@ CONFIG_KERNEL_LZMA=y CONFIG_ECONET_AUNUDP=y CONFIG_ECONET_NATIVE=y +## +### file: drivers/input/mouse/Kconfig +## +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_APPLETOUCH=m + diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 8159bf175..7bc13e642 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -281,15 +281,6 @@ CONFIG_KEYBOARD_ATKBD=m ## CONFIG_INPUT_UINPUT=m -## -## file: drivers/input/mouse/Kconfig -## -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_SERIAL is not set -CONFIG_MOUSE_APPLETOUCH=m -# CONFIG_MOUSE_VSXXXAA is not set - ## ## file: drivers/input/serio/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 774629e08..ae149b058 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -283,15 +283,6 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_IXP4XX_BEEPER=m CONFIG_INPUT_UINPUT=m -## -## file: drivers/input/mouse/Kconfig -## -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_SERIAL is not set -CONFIG_MOUSE_APPLETOUCH=m -# CONFIG_MOUSE_VSXXXAA is not set - ## ## file: drivers/input/serio/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 7917fd1eb..c84872a49 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -174,21 +174,6 @@ CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m -## -## file: drivers/input/mouse/Kconfig -## -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_SERIAL=m -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_VSXXXAA is not set - ## ## file: drivers/input/serio/Kconfig ##