[Linux1394-cvslog] rev 617 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@li...> - 2002-10-19 23:42:18
|
Author: bencollins Date: 2002-10-19 19:42:08 -0400 (Sat, 19 Oct 2002) New Revision: 617 Modified: trunk/dv1394.c trunk/eth1394.c trunk/ieee1394_core.c trunk/ieee1394_transactions.c trunk/nodemgr.c trunk/video1394.c Log: Include linux/bitops.h instead of asm/bitops.h (so we get generic defines), and also include asm/semaphore.h in nodemgr.c to get the sem_getcount static inline. Modified: trunk/ieee1394_core.c ============================================================================== --- trunk/ieee1394_core.c (original) +++ trunk/ieee1394_core.c 2002-10-19 19:42:10.000000000 -0400 @@ -29,7 +29,7 @@ #include <linux/interrupt.h> #include <linux/module.h> #include <linux/proc_fs.h> -#include <asm/bitops.h> +#include <linux/bitops.h> #include <asm/byteorder.h> #include <asm/semaphore.h> Modified: trunk/ieee1394_transactions.c ============================================================================== --- trunk/ieee1394_transactions.c (original) +++ trunk/ieee1394_transactions.c 2002-10-19 19:42:10.000000000 -0400 @@ -10,8 +10,8 @@ */ #include <linux/sched.h> +#include <linux/bitops.h> #include <asm/errno.h> -#include <asm/bitops.h> #include <linux/interrupt.h> #include "ieee1394.h" @@ -222,7 +222,7 @@ spin_lock_irqsave(&tp->lock, flags); packet->tpool = NULL; - __clear_bit(packet->tlabel, &tp->pool); + clear_bit(packet->tlabel, &tp->pool); spin_unlock_irqrestore(&tp->lock, flags); up(&tp->count); Modified: trunk/nodemgr.c ============================================================================== --- trunk/nodemgr.c (original) +++ trunk/nodemgr.c 2002-10-19 19:42:10.000000000 -0400 @@ -11,7 +11,6 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/slab.h> -#include <asm/byteorder.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/kmod.h> @@ -20,6 +19,8 @@ #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #endif +#include <asm/semaphore.h> +#include <asm/byteorder.h> #include "ieee1394_types.h" #include "ieee1394.h" Modified: trunk/eth1394.c ============================================================================== --- trunk/eth1394.c (original) +++ trunk/eth1394.c 2002-10-19 19:42:10.000000000 -0400 @@ -55,9 +55,9 @@ #include <linux/ip.h> #include <linux/tcp.h> #include <linux/skbuff.h> +#include <linux/bitops.h> #include <asm/delay.h> #include <asm/semaphore.h> -#include <asm/bitops.h> #include <net/arp.h> #include "ieee1394_types.h" Modified: trunk/video1394.c ============================================================================== --- trunk/video1394.c (original) +++ trunk/video1394.c 2002-10-19 19:42:10.000000000 -0400 @@ -37,8 +37,7 @@ #include <linux/proc_fs.h> #include <linux/delay.h> #include <linux/devfs_fs_kernel.h> - -#include <asm/bitops.h> +#include <linux/bitops.h> #include <linux/types.h> #include <linux/wrapper.h> #include <linux/vmalloc.h> Modified: trunk/dv1394.c ============================================================================== --- trunk/dv1394.c (original) +++ trunk/dv1394.c 2002-10-19 19:42:10.000000000 -0400 @@ -91,9 +91,9 @@ #include <linux/fs.h> #include <linux/poll.h> #include <linux/smp_lock.h> +#include <linux/bitops.h> #include <asm/byteorder.h> #include <asm/atomic.h> -#include <asm/bitops.h> #include <asm/io.h> #include <asm/uaccess.h> #include <linux/proc_fs.h> |