← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/common/xf86Priv.h

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/common/xf86Priv.h
155
155
extern void xf86PostPreInit(void);
156
156
extern void xf86PostScreenInit(void);
157
157
extern memType getValidBIOSBase(PCITAG tag, int num);
 
158
extern memType getEmptyPciRange(PCITAG tag, int base_reg);
158
159
extern int pciTestMultiDeviceCard(int bus, int dev, int func, PCITAG** pTag);
159
160
 
160
161
/* xf86Config.c */
171
172
void DoScanPci(int argc, char **argv, int i);
172
173
 
173
174
/* xf86DoProbe.c */
174
 
void DoProbeArgs(int argc, char **argv, int i);
175
175
void DoProbe(void);
176
176
void DoConfigure(void);
177
177