[PATCH] SPI: Freescale iMX SPI controller driver (BIS+)

[powerpc.git] / drivers / ieee1394 / ieee1394_core.h

diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index 1ce172b..536ba3f 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"
@@ -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;