rpms/kernel/devel linux-2.6-compile-fixes.patch,1.119,1.120

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31301

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix connector build

linux-2.6-compile-fixes.patch:
 b/drivers/connector/connector.c                    |    5 +--
 b/include/asm-powerpc/io.h                         |    1 
 linux-2.6.19.noarch/drivers/macintosh/via-pmu.c    |    1 
 linux-2.6.19.noarch/include/asm-i386/desc.h        |   28 ++++++++++-----------
 linux-2.6.19.noarch/include/asm-ia64/scatterlist.h |    8 ++++++
 linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c     |   10 +++----
 linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c      |   10 +++----
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c |    4 +++
 8 files changed, 40 insertions(+), 27 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- linux-2.6-compile-fixes.patch	14 Dec 2006 14:17:26 -0000	1.119
+++ linux-2.6-compile-fixes.patch	18 Dec 2006 08:57:32 -0000	1.120
@@ -216,3 +216,19 @@
  }
  #endif
  
+diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
+index 5e7cd45..27f377b 100644
+--- a/drivers/connector/connector.c
++++ b/drivers/connector/connector.c
+@@ -135,9 +135,8 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
+ 	spin_lock_bh(&dev->cbdev->queue_lock);
+ 	list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
+ 		if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
+-			if (likely(!test_bit(WORK_STRUCT_PENDING,
+-					     &__cbq->work.work.management) &&
+-					__cbq->data.ddata == NULL)) {
++			if (likely(!work_pending(&__cbq->work.work) &&
++			    __cbq->data.ddata == NULL)) {
+ 				__cbq->data.callback_priv = msg;
+ 
+ 				__cbq->data.ddata = data;