[PATCH] make the firewire layer build again

diff --git a/drivers/ieee1394/ieee1394_types.h b/drivers/ieee1394/ieee1394_types.h
index d30396111db1dcc2d123ee4be33e9368fdba03bf..850f883541262d07285d7963e8c1863fa26a0f17 100644 (file)
--- a/drivers/ieee1394/ieee1394_types.h
+++ b/drivers/ieee1394/ieee1394_types.h
@@ -7,6 +7,7 @@
 #include <linux/version.h>
 #include <linux/list.h>
 #include <linux/init.h>
+#include <linux/string.h>
 #include <asm/byteorder.h>
 
 

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index d8ff4fd44d55a25353d8c9115656a5d08230658d..08f8ec531aa464cd855c1178b855f1d85277bc29 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1512,7 +1512,7 @@ static void sbp2_remove_device(struct sbp2scsi_host_info *hi,
  * physical dma in hardware). Mostly just here for debugging...
  */
 static int sbp2_handle_physdma_write(struct hpsb_host *host, int nodeid, int destid, quadlet_t *data,
-                                     u64 addr, unsigned int length)
+                                     u64 addr, unsigned int length, u16 flags)
 {
 
         /*
@@ -1528,7 +1528,7 @@ static int sbp2_handle_physdma_write(struct hpsb_host *host, int nodeid, int des
  * physical dma in hardware). Mostly just here for debugging...
  */
 static int sbp2_handle_physdma_read(struct hpsb_host *host, int nodeid, quadlet_t *data,
-                                    u64 addr, unsigned int length)
+                                    u64 addr, unsigned int length, u16 flags)
 {
 
         /*