diff -aurpN -X /home/fletch/.diff.exclude 680-ia64_dec_and_lock/arch/ia64/lib/dec_and_lock.c 680-ivtv/arch/ia64/lib/dec_and_lock.c
--- 680-ia64_dec_and_lock/arch/ia64/lib/dec_and_lock.c	Wed Feb 11 10:17:11 2004
+++ 680-ivtv/arch/ia64/lib/dec_and_lock.c	Wed Feb 11 10:17:28 2004
@@ -18,7 +18,6 @@
  * operations have to be done atomically, so that the count doesn't drop to zero without
  * acquiring the spinlock first.
  */
-#ifndef ATOMIC_DEC_AND_LOCK
 int
 atomic_dec_and_lock (atomic_t *refcount, spinlock_t *lock)
 {
@@ -39,6 +38,5 @@ atomic_dec_and_lock (atomic_t *refcount,
 	} while (cmpxchg(&refcount->counter, old, new) != old);
 	return 0;
 }
-#endif
 
 EXPORT_SYMBOL(atomic_dec_and_lock);