diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
| commit | f331b3c351021681044b2594d1ec5b49bd8edb47 (patch) | |
| tree | 3f593072cd3390f173857a4d0484938aed8863c1 /xorg-server/hw/xfree86/common/xf86pciBus.h | |
| parent | 4e512860d6f0a7644ae3872d91edafa9040f608a (diff) | |
| parent | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (diff) | |
| download | vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.gz vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.bz2 vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86pciBus.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86pciBus.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.h b/xorg-server/hw/xfree86/common/xf86pciBus.h index bcbb8b822..a631fbffb 100644 --- a/xorg-server/hw/xfree86/common/xf86pciBus.h +++ b/xorg-server/hw/xfree86/common/xf86pciBus.h @@ -38,5 +38,8 @@ Bool xf86PciAddMatchingDev(DriverPtr drvp); Bool xf86PciProbeDev(DriverPtr drvp);
void xf86PciIsolateDevice(char *argument);
int xf86PciMatchDriver(char* matches[], int nmatches);
+Bool xf86PciConfigure(void *busData, struct pci_device *pDev);
+void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
+ GDevRec *GDev, int *chipset);
#endif /* _XF86_PCI_BUS_H */
|