Return-path: Received: from mail-qc0-f174.google.com ([209.85.216.174]:41787 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759367Ab2FUPZQ (ORCPT ); Thu, 21 Jun 2012 11:25:16 -0400 Received: by qcro28 with SMTP id o28so389135qcr.19 for ; Thu, 21 Jun 2012 08:25:15 -0700 (PDT) From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= To: linux-wireless@vger.kernel.org Cc: mcgrof@kernel.org, =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Subject: [PATCH v2] compat: Define include guard for vga_switcheroo.h Date: Thu, 21 Jun 2012 18:25:08 +0300 Message-Id: <1340292308-6993-1-git-send-email-ozancag@gmail.com> (sfid-20120621_172520_767423_D8E6422A) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: The check is missing in upstream. Patch sent but until this gets merged, define it in compat tree for fixing compat-drm builds. Also add a temporary header with the same name which will be used to check whether the header should be included or not. Signed-off-by: Ozan Çağlayan --- include/linux/compat-3.5.h | 6 ++++++ include/linux/vga_switcheroo.h | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 include/linux/vga_switcheroo.h diff --git a/include/linux/compat-3.5.h b/include/linux/compat-3.5.h index 74c8176..e999aee 100644 --- a/include/linux/compat-3.5.h +++ b/include/linux/compat-3.5.h @@ -78,6 +78,12 @@ static inline int fault_in_multipages_readable(const char __user *uaddr, /* switcheroo is available on >= 2.6.34 */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) #include + +/* FIXME: The include guard is sent upstream, drop this + * once the guard is merged. */ +#ifndef LINUX_VGA_SWITCHEROO_H +#define LINUX_VGA_SWITCHEROO_H +#endif /* * This backports: * diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h new file mode 100644 index 0000000..26ac71d --- /dev/null +++ b/include/linux/vga_switcheroo.h @@ -0,0 +1,6 @@ +/* Hack for fixing the missing include guard in upstream + * header. We will drop this when the patch is merged upstream. */ + +#ifndef LINUX_VGA_SWITCHEROO_H +#include_next +#endif -- 1.7.10.2