Ok, I fixed the patch up, but it looks like you did not make thisagainst the linux-next tree, but against Linus's tree, right? The codehas changed since Linus's tree a bit in places (dead code was removed),and it conflicted with this patch.