Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / ieee1394 / ieee1394_core.h

diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index 1ce172b2856910fe338fdc91ea6655efaf79db4b..af4a78a8ef3b124f61e9a9b667cc8b9f5383ee7f 100644 (file)
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -7,7 +7,6 @@
 #include <linux/skbuff.h>
 #include <linux/types.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 
 #include "hosts.h"
 #include "ieee1394_types.h"