From patchwork Thu Dec 31 11:19:00 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= <nm127@freemail.hu>
X-Patchwork-Id: 2391
Return-path: <linux-media-owner@vger.kernel.org>
Envelope-to: mchehab@infradead.org
Delivery-date: Thu, 31 Dec 2009 11:19:08 +0000
Received: from bombadil.infradead.org [18.85.46.34]
	by pedra with IMAP (fetchmail-6.3.6)
	for <mchehab@localhost> (single-drop);
	Fri, 01 Jan 2010 00:47:47 -0200 (BRST)
Received: from vger.kernel.org ([209.132.180.67])
	by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux))
	id 1NQJ3c-0007Y3-JD; Thu, 31 Dec 2009 11:19:08 +0000
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750730AbZLaLTG (ORCPT <rfc822; kmpark@infradead.org> + 1 other);
	Thu, 31 Dec 2009 06:19:06 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750722AbZLaLTG
	(ORCPT <rfc822;linux-media-outgoing>);
	Thu, 31 Dec 2009 06:19:06 -0500
Received: from mail02d.mail.t-online.hu ([84.2.42.7]:60478 "EHLO
	mail02d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750720AbZLaLTF (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Thu, 31 Dec 2009 06:19:05 -0500
Received: from [192.168.1.64] (dsl51B6C4AD.pool.t-online.hu [81.182.196.173])
	(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 E1171758764;
	Thu, 31 Dec 2009 12:17:35 +0100 (CET)
Message-ID: <4B3C88A4.6070808@freemail.hu>
Date: Thu, 31 Dec 2009 12:19:00 +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>
CC: Hans Verkuil <hverkuil@xs4all.nl>, Michael Krufky <mkrufky@linuxtv.org>,
	linux-media@vger.kernel.org
Subject: [PATCH] move autoconf.h for 2.6.33
References: <200912291959.nBTJxkB3066435@smtp-vbr9.xs4all.nl>
	<4B3A72E1.9010107@freemail.hu> <4B3A86ED.1090303@redhat.com>
	<4B3A8E10.9000609@freemail.hu>
In-Reply-To: <4B3A8E10.9000609@freemail.hu>
X-DCC-mail.t-online.hu-Metrics: mail02d.mail.t-online.hu 32721; 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

From: Márton Németh <nm127@freemail.hu>

The linux/autoconf.h was moved to generated/autoconf.h as of 2.6.33.

Signed-off-by: Márton Németh <nm127@freemail.hu>
---

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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.