diff --git a/[refs] b/[refs] index e3a9beb8144e..83ea84231a3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 128537cea464d919febeaea2000e256749f317eb +refs/heads/master: 9f5231472340ebcaf2dec75428b67d5d0d872857 diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig index ba14ec898258..0e668ccc2511 100644 --- a/trunk/drivers/hid/Kconfig +++ b/trunk/drivers/hid/Kconfig @@ -184,11 +184,10 @@ config LOGIRUMBLEPAD2_FF Rumblepad 2 devices. config HID_MAGICMOUSE - tristate "Apple" if EMBEDDED + tristate "Apple MagicMouse multi-touch support" depends on BT_HIDP - default !EMBEDDED ---help--- - Support for the Apple Magic Mouse. + Support for the Apple Magic Mouse multi-touch. Say Y here if you want support for the multi-touch features of the Apple Wireless "Magic" Mouse.