From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Jul 2008 16:19:36 +0000 (-0700)
Subject: Undo duplicate "m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>"
X-Git-Tag: v2.6.27-rc1~503
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29b309e52d3d51ef8a15bd15590903cf272beb93;p=linux-2.6

Undo duplicate "m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>"

Both commits 0f17e4c796e89d1f69f13b653aba60e6ccfb8ae0 ("Add missing
semaphore.h includes") and 4933d07531711e399d8d578036aa9fc1be2f9b20
("m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>") added a

We only really need one ;)

Reported-by: Huang Weiyi <weiyi.huang@gmail.com>
Requested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index aad664d525..0d395979b2 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -70,7 +70,6 @@
 #include <linux/semaphore.h>
 #include <linux/slab.h>
 #include <linux/hil.h>
-#include <linux/semaphore.h>
 #include <asm/io.h>
 #include <asm/system.h>