From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/hid/Kconfig |    5 -----
 1 files changed, 5 deletions(-)

diff -puN drivers/hid/Kconfig~git-hid-fixup drivers/hid/Kconfig
--- a/drivers/hid/Kconfig~git-hid-fixup
+++ a/drivers/hid/Kconfig
@@ -36,10 +36,8 @@ config HID_DEBUG
 
 	If unsure, say N
 
-<<<<<<< HEAD/drivers/hid/Kconfig
 source "drivers/hid/usbhid/Kconfig"
 
-=======
 config HIDRAW
 	bool "/dev/hidraw raw HID device support"
 	depends on HID
@@ -59,7 +57,4 @@ config HIDRAW
 
 	If unsure, say Y.
 
-
->>>>>>> /drivers/hid/Kconfig
 endmenu
-
_