From c604f4472054ced0cc16ebb767314453066a7aed Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 10 Feb 2010 14:59:03 +0100
Subject: [PATCH] --- yaml --- r: 180863 b: refs/heads/master c:
 9f5231472340ebcaf2dec75428b67d5d0d872857 h: refs/heads/master i:   180861:
 1ccbd9ef6591ead5fcd6cb57ad11ee1e8586468f   180859:
 e70cfc955c2d3e40c6a7d9ec2a5d4987e3b8a5ad   180855:
 7c7ae762659c76aca73367db63e28162e058cd1d   180847:
 41bd4b71b0dc0a4338b53310a325dbea0d47ab1a   180831:
 e1afedfc51d3b5aa243a2526937f097b45a83c75   180799:
 623cd08209ba9287e405bc569616f40283d0a98c   180735:
 fe63ced329027591722de69ca5861df56b6dca55 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/hid/Kconfig | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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.