From f0ec2cd1bf5313d7c14ae3211b062ed51deba10e Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 20 Mar 2009 15:40:35 +0000 Subject: [PATCH] [arm/iop32x, arm/ixp4xx, arm/orion5x] Enable INPUT_JOYDEV, GAMEPORT and INPUT_JOYSTICK (Closes: #520433). svn path=/dists/trunk/linux-2.6/; revision=13182 --- debian/changelog | 2 ++ debian/config/arm/config.iop32x | 6 +++--- debian/config/arm/config.ixp4xx | 6 +++--- debian/config/arm/config.orion5x | 11 +++++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4d81e6f3..b02041712 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,8 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low * [arm/orion5x] Build the SENSORS_LM75 module since it's needed on the D-Link DNS-323. * [arm/iop32x, arm/ixp4xx, arm/orion5x] Enable INPUT_TOUCHSCREEN. + * [arm/iop32x, arm/ixp4xx, arm/orion5x] Enable INPUT_JOYDEV, GAMEPORT + and INPUT_JOYSTICK (Closes: #520433). * [arm/iop32x, arm/ixp4xx, arm/orion5x] Add a size check to ensure that the kernel will fit in flash. * Add patches from git.marvell.com to improve Kirkwood support: diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index f4e8d0f52..27f2cfce4 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -273,18 +273,18 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m ## ## file: drivers/input/gameport/Kconfig ## -# CONFIG_GAMEPORT is not set +CONFIG_GAMEPORT=m ## ## file: drivers/input/joystick/Kconfig ## -# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_JOYSTICK=y ## ## file: drivers/input/keyboard/Kconfig diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 3bf0aa7c0..45a42fe59 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -283,18 +283,18 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m ## ## file: drivers/input/gameport/Kconfig ## -# CONFIG_GAMEPORT is not set +CONFIG_GAMEPORT=m ## ## file: drivers/input/joystick/Kconfig ## -# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_JOYSTICK=y ## ## file: drivers/input/keyboard/Kconfig diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x index dc4184f7b..50de66fba 100644 --- a/debian/config/arm/config.orion5x +++ b/debian/config/arm/config.orion5x @@ -172,8 +172,19 @@ CONFIG_I2C_MV64XXX=y ## ## file: drivers/input/Kconfig ## +CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m +## +## file: drivers/input/gameport/Kconfig +## +CONFIG_GAMEPORT=m + +## +## file: drivers/input/joystick/Kconfig +## +CONFIG_INPUT_JOYSTICK=y + ## ## file: drivers/input/keyboard/Kconfig ##