diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-08-12 17:03:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-08-12 17:03:17 -0700 |
| commit | 0952a3969a9b49bab820cae1bf45522df3f76301 (patch) | |
| tree | 80c1f3904b22feb5b50f8f76cc7ad8364e6552d1 | |
| parent | 109745d5c7e6982ee0dabbc5a233c1f2667ad5c9 (diff) | |
Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`
`git diff -w` & `git diff -b` show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark/-/merge_requests/9>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/ark.h | 2 | ||||
| -rw-r--r-- | src/ark_driver.c | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -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' -# +# @@ -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); |