diff --git a/[refs] b/[refs]
index cb6de6dee5ed..e3fda8a7e5e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4c259bcc27c4242b012106afdba183622b1735f
+refs/heads/master: a2d693cf650f000ea22351484ee66cf4c2651eef
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 111afbe8de03..24d90ea246ce 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -204,13 +204,6 @@ config HID_NTRIG
 	---help---
 	Support for N-Trig touch screen.
 
-config HID_PANTHERLORD
-	tristate "Pantherlord devices support" if EMBEDDED
-	depends on USB_HID
-	default !EMBEDDED
-	---help---
-	Support for PantherLord/GreenAsia based device support.
-
 config HID_PANTHERLORD
 	tristate "Pantherlord support" if EMBEDDED
 	depends on USB_HID