[Linux1394-cvslog] rev 642 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@li...> - 2002-10-22 20:31:27
|
Author: bencollins Date: 2002-10-22 16:31:23 -0400 (Tue, 22 Oct 2002) New Revision: 642 Modified: trunk/cmp.c trunk/nodemgr.c trunk/raw1394.c trunk/video1394.c Log: I love typos and warnings, don't you? Modified: trunk/raw1394.c ============================================================================== --- trunk/raw1394.c (original) +++ trunk/raw1394.c 2002-10-22 16:31:24.000000000 -0400 @@ -37,6 +37,7 @@ #include <linux/init.h> #include <linux/version.h> #include <linux/smp_lock.h> +#include <linux/interrupt.h> #include <asm/uaccess.h> #include <asm/atomic.h> #include <linux/devfs_fs_kernel.h> Modified: trunk/nodemgr.c ============================================================================== --- trunk/nodemgr.c (original) +++ trunk/nodemgr.c 2002-10-22 16:31:24.000000000 -0400 @@ -1326,7 +1326,7 @@ struct host_info *hi; unsigned long flags; - hi = kmalloc(sizeof (struct hpsb_info), in_interrupt() ? SLAB_ATOMIC : SLAB_KERNEL); + hi = kmalloc(sizeof (struct host_info), in_interrupt() ? SLAB_ATOMIC : SLAB_KERNEL); if (!hi) { HPSB_ERR ("NodeMgr: out of memory in add host"); Modified: trunk/cmp.c ============================================================================== --- trunk/cmp.c (original) +++ trunk/cmp.c 2002-10-22 16:31:25.000000000 -0400 @@ -34,6 +34,7 @@ #include <linux/sched.h> #include <linux/types.h> #include <linux/wait.h> +#include <linux/interrupt.h> #include "hosts.h" #include "highlevel.h" Modified: trunk/video1394.c ============================================================================== --- trunk/video1394.c (original) +++ trunk/video1394.c 2002-10-22 16:31:25.000000000 -0400 @@ -1254,7 +1254,7 @@ if (ctx->current_ctx == NULL) { PRINT(KERN_ERR, ctx->video->ohci->id, "Current iso context not set"); } else - res = do_iso_mmap(ohci, ctx->current_ctx, vma); + res = do_iso_mmap(ctx->video->ohci, ctx->current_ctx, vma); unlock_kernel(); return res; |