From: Peter Huewe <peterhuewe@gmx.de>
To: gregkh@linuxfoundation.org
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Dan Carpenter <dan.carpenter@oracle.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Peter Huewe <peterhuewe@gmx.de>
Subject: [PATCH 1/7] staging/xgifb: Include sis initdef.h header
Date: Thu, 9 Feb 2012 21:11:43 +0100 [thread overview]
Message-ID: <1328818309-5103-2-git-send-email-peterhuewe@gmx.de> (raw)
In-Reply-To: <1328818309-5103-1-git-send-email-peterhuewe@gmx.de>
This patch includes the initdef.h header from the sis driver.
Since the xgi driver used to redefine a lot of stuff from the sis
driver, we can simply include the headers of the sis driver itself, so
we can remove duplicated stuff later on.
In order to include the initdef.h we have to rename the header guards.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/staging/xgifb/vb_def.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
index 5beeef9..0472c86 100644
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -1,7 +1,8 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/initdef.h
* ,v 1.4 2000/12/02 01:16:17 dawes Exp $*/
-#ifndef _INITDEF_
-#define _INITDEF_
+#ifndef _VB_DEF_
+#define _VB_DEF_
+#include "../../video/sis/initdef.h"
#define VB_XGI301C 0x0020 /* for 301C */
/*end 301b*/
--
1.7.3.4
next prev parent reply other threads:[~2012-02-09 20:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 20:11 staging/xgifb: Use sis headers and remove duplicated structs and defines (part II) Peter Huewe
2012-02-09 20:11 ` Peter Huewe [this message]
2012-02-09 20:11 ` [PATCH 2/7] staging/xgifb: Rename panel defines and remove duplicated defines Peter Huewe
2012-02-09 20:11 ` [PATCH 3/7] staging/xgifb: Rename Set* " Peter Huewe
2012-02-09 20:11 ` [PATCH 4/7] staging/xgifb: Rename remaining sis initdef.h defines and remove duplicates Peter Huewe
2012-02-09 20:11 ` [PATCH 5/7] staging/xgifb: Rename XGI specific initdef.h defines Peter Huewe
2012-02-09 20:11 ` [PATCH 6/7] staging/xgifb: Use TVCLKBASE_315 as a base address Peter Huewe
2012-02-09 20:11 ` [PATCH 7/7] staging/xgifb: remove remaining duplicate initdef.h defines Peter Huewe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328818309-5103-2-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=aaro.koskinen@iki.fi \
--cc=arnaud.patard@rtp-net.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®