Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / drivers / input / misc / yealink.c

diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index facefd3dba29a1aab6c4428c6bdef9a2a3aa1b55..11b5c7e84ed139ad9af9fe21fccc04927edd2a31 100644 (file)
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -52,8 +52,8 @@
 #include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/usb/input.h>
+#include <linux/map_to_7segment.h>
 
-#include "map_to_7segment.h"
 #include "yealink.h"
 
 #define DRIVER_VERSION "yld-20051230"