diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
| commit | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (patch) | |
| tree | 1198628dab08c3989dff073b4bbe6920a1feca59 /hw/xfree86/ddc/xf86DDC.h | |
| parent | e9130b8bac73a0843d5ff6b2216eccfb3e094a48 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
Diffstat (limited to 'hw/xfree86/ddc/xf86DDC.h')
| -rw-r--r-- | hw/xfree86/ddc/xf86DDC.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 77994715e..3b072dda7 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -43,10 +43,6 @@ extern xf86MonPtr xf86InterpretEDID( int screenIndex, Uchar *block ); -extern xf86vdifPtr xf86InterpretVdif( - CARD8 *c -); - extern void xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC); @@ -55,10 +51,6 @@ extern Bool xf86SetDDCproperties( xf86MonPtr DDC ); -extern void xf86print_vdif( - xf86vdifPtr v -); - DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); #endif |