Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 464c940b8..b3b45fc0b 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -86,7 +86,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
 	
 static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
 				 struct autofs_wait_queue *wq,
-				 enum autofs_packet_type type)
+				 int type)
 {
 	union autofs_packet_union pkt;
 	size_t pktsz;