aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authormerge <null@invalid>2008-12-11 17:19:32 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-11 17:19:32 +0000
commitde473ca893c9285ab2dd3ea82973e6f253eaec1d (patch)
tree5824c69cfba3cfd461851c601b294ecf0b41d846 /arch
parentb3c6cd4348a8a97c010be15faeadce2e783c7d33 (diff)
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-kill-evbug-patch-1229015794
pending-tracking-hist top was MERGE-via-stable-tracking-config-kill-evbug-patch-1229015794 / cf65aecd5f77e51a244ff4647afa409056c3d725 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-kill-evbug-patch stable-tracking-hist top was config-kill-evbug-patch / 16e183d5b9b5e0bc6d14877a8815e91d9000792e ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-kill-evbug.patch Reported-by: Klaus Kurzmann <mok@mnet-online.de> Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/gta02-moredrivers-defconfig2
-rw-r--r--arch/arm/configs/gta02-packaging-defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
index 378bc93064a..0d67185a2b3 100644
--- a/arch/arm/configs/gta02-moredrivers-defconfig
+++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -954,7 +954,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
+# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig
index 78d15368674..0f8ee7e2b60 100644
--- a/arch/arm/configs/gta02-packaging-defconfig
+++ b/arch/arm/configs/gta02-packaging-defconfig
@@ -958,7 +958,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
+# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers