CHROMIUM: Enable CONFIG_HID_MICROSOFT in base config.

This is needed for some MS mice and should be on all
systems. Specifically this was missing from ARM based devices.

Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chromium-os:36240
TEST=Tested Link and Daisy to make sure the mouse worked on both.

Change-Id: I610d2593cd6b3e5eb2f19d4831e7e01c582db93a
Reviewed-on: https://gerrit.chromium.org/gerrit/40335
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Commit-Queue: Andrew de los Reyes <adlr@chromium.org>
Tested-by: Andrew de los Reyes <adlr@chromium.org>

diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 5dbcddfee219724b9826ac82789f53d1f43a6c9b..5400582c7bdda513606233566c042dd0d21a9d85 100644 (file)
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -162,7 +162,6 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_SMP=y
-# CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_PID is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index a8ef1719c7cedefe0a861c31f5966290af58b8a0..097a5a63fd50dbacb7822eb46d7a90e563db5f29 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -571,6 +571,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
 # CONFIG_HID_MONTEREY is not set
 CONFIG_HID_MULTITOUCH=m
 # CONFIG_HID_NTRIG is not set

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index c299770c11f99d3868b8edd510e4d513e332bd78..f63d921d933eecb9f79548fe1af16eb46075c1fb 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -334,7 +334,6 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 # CONFIG_HERMES is not set
 # CONFIG_HIBERNATION is not set
-CONFIG_HID_MICROSOFT=m
 CONFIG_HID_PID=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index d55e416cf663b5f789bbf04a4cb539b85b3fd43d..39fa13952ee9dbeab2864a48b17882b094b2d7c5 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -355,7 +355,6 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 # CONFIG_HERMES is not set
 # CONFIG_HIBERNATION is not set
-CONFIG_HID_MICROSOFT=m
 CONFIG_HID_PID=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP_PCI=m