diff --git a/.gitignore b/.gitignore index 386322c..189cd5f 100644 --- a/.gitignore +++ b/.gitignore @@ -71,8 +71,8 @@ core *.tar.bz2 *.tar.gz # -# Add & Override patterns for xf86-video-ark +# Add & Override patterns for xf86-video-ark # # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' -# +# diff --git a/src/ark.h b/src/ark.h index 9797ead..4b0fa35 100644 --- a/src/ark.h +++ b/src/ark.h @@ -30,7 +30,7 @@ typedef struct _ARKRegRec { typedef struct _ARKRec { -#ifndef XSERVER_LIBPCIACCESS +#ifndef XSERVER_LIBPCIACCESS pciVideoPtr PciInfo; PCITAG PciTag; #else diff --git a/src/ark_driver.c b/src/ark_driver.c index 95fc8f5..1df9da6 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -6,7 +6,7 @@ * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation and + * notice and this permission notice appear in supporting documentation and * that the name of Ani Joshi not be used in advertising or * publicity pertaining to distribution of the software without specific, * written prior permission. Ani Joshi makes no representations @@ -726,7 +726,7 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) "Unsupported screen width %d\n", pScrn->displayWidth); return FALSE; - } + } new->sr17 &= ~0xc7; new->sr17 |= modepitch; @@ -1025,7 +1025,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) PCI_DEV_MAP_FLAG_WRITABLE | PCI_DEV_MAP_FLAG_WRITE_COMBINE, result); - + if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not map framebuffer: %d\n", err);