diff options
| author | Peter Huewe <peterhuewe@gmx.de> | 2012-02-09 21:11:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 09:56:21 -0800 |
| commit | 84359ef62aa36dc92508547852587b284c2664d2 (patch) | |
| tree | 0f29e0041b064831f144b7729975f192ad98c368 /drivers/staging/xgifb | |
| parent | c123daaad835681d4acffd7631e448fd2c77677f (diff) | |
| download | blackbird-op-linux-84359ef62aa36dc92508547852587b284c2664d2.tar.gz blackbird-op-linux-84359ef62aa36dc92508547852587b284c2664d2.zip | |
staging/xgifb: Include sis initdef.h header
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | 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 5beeef99bb14..0472c86b2923 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*/ |
