From patchwork Wed Feb 3 20:22:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 76797 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o13KMdgC019648 for ; Wed, 3 Feb 2010 20:22:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757493Ab0BCUWj (ORCPT ); Wed, 3 Feb 2010 15:22:39 -0500 Received: from mail-in-03.arcor-online.net ([151.189.21.43]:36439 "EHLO mail-in-03.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756634Ab0BCUWi (ORCPT ); Wed, 3 Feb 2010 15:22:38 -0500 Received: from mail-in-12-z2.arcor-online.net (mail-in-12-z2.arcor-online.net [151.189.8.29]) by mx.arcor.de (Postfix) with ESMTP id CC0112C2B8D; Wed, 3 Feb 2010 21:22:36 +0100 (CET) Received: from mail-in-06.arcor-online.net (mail-in-06.arcor-online.net [151.189.21.46]) by mail-in-12-z2.arcor-online.net (Postfix) with ESMTP id B60FB279468; Wed, 3 Feb 2010 21:22:36 +0100 (CET) Received: from [192.168.2.102] (dslb-188-103-200-201.pools.arcor-ip.net [188.103.200.201]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-06.arcor-online.net (Postfix) with ESMTPA id 574BC39A636; Wed, 3 Feb 2010 21:22:36 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-06.arcor-online.net 574BC39A636 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265228556; bh=6NbLzYcjwQMD48R5G40+zMXkih+QFh6CW9Ensy+9xYA=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=nTOVkFLan1jSx844sy4WIUunERYh/02ofDIr1dMgUrb7VNFwYJsqIbQWlDy8JTQxQ J77oMM2TYzdBjpqDaFXr95eko6hwK2nk1yPZjfPlhl2r3hgeo9C7rx+UbNqA3hB4LG Iox9HAoughGkq/7+hFwEf4Z3Td1zZAigZyp4tQ6k= Message-ID: <4B69DAEF.8040806@arcor.de> Date: Wed, 03 Feb 2010 21:22:07 +0100 From: Stefan Ringel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: linux-media@vger.kernel.org, Devin Heitmueller Subject: [PATCH 7/15] - tm6000 References: <4B673790.3030706@arcor.de> <4B673B2D.6040507@arcor.de> <4B675B19.3080705@redhat.com> <4B685FB9.1010805@arcor.de> <4B688507.606@redhat.com> <4B688E41.2050806@arcor.de> <4B689094.2070204@redhat.com> <4B6894FE.6010202@arcor.de> <4B69D83D.5050809@arcor.de> <4B69D8CC.2030008@arcor.de> In-Reply-To: <4B69D8CC.2030008@arcor.de> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 03 Feb 2010 20:22:40 +0000 (UTC) --- a/drivers/staging/tm6000/tm6000.h +++ b/drivers/staging/tm6000/tm6000.h @@ -23,12 +23,15 @@ // Use the tm6000-hack, instead of the proper initialization code //#define HACK 1 +#include "compat.h" #include #include #include #include "tm6000-usb-isoc.h" #include +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include +#endif #include @@ -78,6 +81,10 @@ struct tm6000_dmaqueue { /* thread for generating video stream*/ struct task_struct *kthread; wait_queue_head_t wq; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + struct semaphore *notify; + int rmmod:1; +#endif /* Counters to control fps rate */ int frame; int ini_jiffies;