diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-03-15 21:57:46 -0300 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-05-13 11:56:04 +0200 |
| commit | 38ca3645e9bded8226aba05c0e5fd6f7fc080c1a (patch) | |
| tree | 4e7ea74ecc59477588b4ebf3a7476534496b9e1e /src | |
| parent | dc2a372ad7edf34417d7d7042562b601e4f0041c (diff) | |
Compile warning fix.
Don't redeclare variable err; cut&paste error that caused warning about
mixed code and declarations.
Minor consistency change to neo_pcirename.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/neo_driver.c | 2 | ||||
| -rw-r--r-- | src/neo_pcirename.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/neo_driver.c b/src/neo_driver.c index 633146d..aca25b5 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -2083,7 +2083,7 @@ neoMapMem(ScrnInfoPtr pScrn) if (nPtr->NeoMMIOAddr2 != 0){ result = (void**)&nPtr->NeoMMIOBase2; - int err = pci_device_map_range(nPtr->PciInfo, + err = pci_device_map_range(nPtr->PciInfo, nPtr->NeoMMIOAddr2, 0x100000L, PCI_DEV_MAP_FLAG_WRITABLE, diff --git a/src/neo_pcirename.h b/src/neo_pcirename.h index f0f5cf8..2492dc0 100644 --- a/src/neo_pcirename.h +++ b/src/neo_pcirename.h @@ -26,8 +26,8 @@ * library. The main purpose being to facilitate source code compatibility. */ -#ifndef CIRPCIRENAME_H -#define CIRPCIRENAME_H +#ifndef NEOPCIRENAME_H +#define NEOPCIRENAME_H enum region_type { REGION_MEM, @@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr; #endif /* XSERVER_LIBPCIACCESS */ -#endif /* CIRPCIRENAME_H */ +#endif /* NEOPCIRENAME_H */ |