From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 13/17] UAPI: Fix nested __KERNEL__ guards in video/edid.h Date: Tue, 13 Dec 2011 10:04:09 +0000 Message-ID: <1323770653-19177-14-git-send-email-dhowells@redhat.com> References: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Return-path: In-Reply-To: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: sfr@canb.auug.org.au, torvalds@linux-foundation.org Cc: arnd@arndb.de, dhowells@redhat.com, alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org List-Id: linux-arch.vger.kernel.org Fix nested __KERNEL__ guards in video/edid.h to make parsing easier. Signed-off-by: David Howells --- include/video/edid.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/video/edid.h b/include/video/edid.h index 928c342..c5f1987 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,16 +1,14 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -#if !defined(__KERNEL__) || defined(CONFIG_X86) - struct edid_info { unsigned char dummy[128]; }; #ifdef __KERNEL__ +#ifdef CONFIG_X86 extern struct edid_info edid_info; -#endif /* __KERNEL__ */ - +#endif #endif #endif /* __linux_video_edid_h__ */ -- 1.7.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from warthog.procyon.org.uk ([90.155.74.18]:52113 "EHLO warthog.procyon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754150Ab1LMKjP (ORCPT ); Tue, 13 Dec 2011 05:39:15 -0500 From: David Howells Subject: [PATCH 13/17] UAPI: Fix nested __KERNEL__ guards in video/edid.h Date: Tue, 13 Dec 2011 10:04:09 +0000 Message-ID: <1323770653-19177-14-git-send-email-dhowells@redhat.com> In-Reply-To: <1323770653-19177-1-git-send-email-dhowells@redhat.com> References: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: sfr@canb.auug.org.au, torvalds@linux-foundation.org Cc: arnd@arndb.de, dhowells@redhat.com, alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Message-ID: <20111213100409.ZvPmcr-XWJVFP-8atKQ9XjWhUr6QP9TzvG4Hrge-CsY@z> Fix nested __KERNEL__ guards in video/edid.h to make parsing easier. Signed-off-by: David Howells --- include/video/edid.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/video/edid.h b/include/video/edid.h index 928c342..c5f1987 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,16 +1,14 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -#if !defined(__KERNEL__) || defined(CONFIG_X86) - struct edid_info { unsigned char dummy[128]; }; #ifdef __KERNEL__ +#ifdef CONFIG_X86 extern struct edid_info edid_info; -#endif /* __KERNEL__ */ - +#endif #endif #endif /* __linux_video_edid_h__ */ -- 1.7.7.4