From patchwork Thu Jan  7 06:25:45 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?b?TsODwqltZXRoIE3Dg8KhcnRvbg==?=
 <nm127@freemail.hu>
X-Patchwork-Id: 71546
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o076Psc4017493
	for <patchwork-media@patchwork.kernel.org>;
	Thu, 7 Jan 2010 06:25:54 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752564Ab0AGGZw (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Thu, 7 Jan 2010 01:25:52 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752571Ab0AGGZw
	(ORCPT <rfc822;linux-media-outgoing>);
	Thu, 7 Jan 2010 01:25:52 -0500
Received: from mail02d.mail.t-online.hu ([84.2.42.7]:64856 "EHLO
	mail02d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932336Ab0AGGZv (ORCPT
	<rfc822; linux-media@vger.kernel.org>); Thu, 7 Jan 2010 01:25:51 -0500
Received: from [192.168.1.64] (dsl5402C42F.pool.t-online.hu [84.2.196.47])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail02d.mail.t-online.hu (Postfix) with ESMTPSA id 66B74758AFA;
	Thu,  7 Jan 2010 07:24:11 +0100 (CET)
Message-ID: <4B457E69.2010700@freemail.hu>
Date: Thu, 07 Jan 2010 07:25:45 +0100
From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= <nm127@freemail.hu>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU;
	rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16
MIME-Version: 1.0
To: Mauro Carvalho Chehab <mchehab@redhat.com>,
	Hans Verkuil <hverkuil@xs4all.nl>
CC: Michael Krufky <mkrufky@linuxtv.org>, linux-media@vger.kernel.org
Subject: [RESEND][PATCH] move autoconf.h for 2.6.33
X-DCC-mail.t-online.hu-Metrics: mail02d.mail.t-online.hu 32711; Body=4 Fuz1=4
	Fuz2=4
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org


diff -r 62ee2b0f6556 v4l/scripts/make_config_compat.pl
--- a/v4l/scripts/make_config_compat.pl	Wed Dec 30 18:19:11 2009 +0100
+++ b/v4l/scripts/make_config_compat.pl	Thu Dec 31 11:37:34 2009 +0100
@@ -383,9 +383,19 @@
 # Do the basic rules
 open IN, "<$infile" or die "File not found: $infile";

-$out.= "#ifndef __CONFIG_COMPAT_H__\n";
-$out.= "#define __CONFIG_COMPAT_H__\n\n";
-$out.= "#include <linux/autoconf.h>\n\n";
+$out .= <<'EOD'
+#ifndef __CONFIG_COMPAT_H__
+#define __CONFIG_COMPAT_H__
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+#include <linux/autoconf.h>
+#else
+#include <generated/autoconf.h>
+#endif
+
+EOD
+;

 # mmdebug.h includes autoconf.h. So if this header exists,
 # then include it before our config is set.