X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fieee1394%2Fieee1394_core.h;h=536ba3f580fd49995fc812353167d8cc65307570;hb=b361735043e3001eadb1d40916fd1a4fca1a9363;hp=1ce172b2856910fe338fdc91ea6655efaf79db4b;hpb=de4394f13cc843fae2a3ba2df752ee20e6e779a8;p=linux-2.6

diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index 1ce172b285..536ba3f580 100644
--- 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"
@@ -218,7 +217,7 @@ void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size,
 /* return the index (within a minor number block) of a file */
 static inline unsigned char ieee1394_file_to_instance(struct file *file)
 {
-	return file->f_dentry->d_inode->i_cindex;
+	return file->f_path.dentry->d_inode->i_cindex;
 }
 
 extern int hpsb_disable_irm;