From patchwork Mon Jan 17 22:59:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 484781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0HMxXTP004931 for ; Mon, 17 Jan 2011 22:59:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213Ab1AQW7b (ORCPT ); Mon, 17 Jan 2011 17:59:31 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:61235 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753204Ab1AQW7a (ORCPT ); Mon, 17 Jan 2011 17:59:30 -0500 Received: by wyb28 with SMTP id 28so5520308wyb.19 for ; Mon, 17 Jan 2011 14:59:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=WPbi/+2YNeX/3qHi3lo7g/vohr7s1IKtJcAST8n0FgU=; b=i+HaJOrnTiDku/9ezCIHdhAVVv7kSQX8548wcG2UXo7RZH+ZqjMfLecWbUoY7I/tko JSZSuIdHaXWIBEQBZFjqmMU6EnNlrDINgOgs+Gw+SiCRI+1oD3jV24hurkmnBiDNzb7l dtxtSHRD0MwsTASAbrkymx67DnEmol1pfpsac= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=mP3ieZDQURVIn/+aU1TAFHbelHEkGUYt84+uxNzvBBxVhDw/w6xxhjy6QlbqW3dTnr FPTqVVSmsikvvqFMt8SYj+IemnyrwRqHJbpQGdDy1uIprQqLJRXKyqqOC/AJLAXEzRGZ KAbDUF46xRhchHclz9Hd2BHqV2J8PGzKEiur8= Received: by 10.216.186.142 with SMTP id w14mr4445953wem.18.1295305167456; Mon, 17 Jan 2011 14:59:27 -0800 (PST) Received: from [10.64.64.65] (92.41.251.232.sub.mbb.three.co.uk [92.41.251.232]) by mx.google.com with ESMTPS id a50sm1092258wer.42.2011.01.17.14.59.25 (version=SSLv3 cipher=RC4-MD5); Mon, 17 Jan 2011 14:59:26 -0800 (PST) Subject: [PATCH][_COMPAT_H] git://linuxtv.org/media_build.git Legacy issues From: Malcolm Priestley To: linux-media@vger.kernel.org Date: Mon, 17 Jan 2011 22:59:21 +0000 Message-ID: <1295305161.2162.21.camel@tvboxspy> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 17 Jan 2011 22:59:38 +0000 (UTC) diff --git a/v4l/compat.h b/v4l/compat.h index 9e622ce..df98698 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -749,6 +749,8 @@ static inline void *vzalloc(unsigned long size) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) + #if NEED_FLUSH_WORK_SYNC #define flush_work_sync(dev) #endif @@ -760,6 +762,14 @@ static inline void *vzalloc(unsigned long size) } #endif +#define alloc_ordered_workqueue(a,b) create_singlethread_workqueue(a) + +#else +#ifdef CONFIG_PM +#include +#endif +#endif + #ifndef KEY_10CHANNELSUP #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */