diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /include/xorg-server.h.in | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'include/xorg-server.h.in')
| -rw-r--r-- | include/xorg-server.h.in | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 00fd1cffa..dc6f1b31f 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -31,9 +31,6 @@ /* Build DPMS extension */ #undef DPMSExtension -/* Built-in output drivers */ -#undef DRIVERS - /* Build GLX extension */ #undef GLXEXT @@ -46,9 +43,6 @@ /* Support SHM */ #undef HAS_SHM -/* Built-in input drivers */ -#undef IDRIVERS - /* Support IPv6 for TCP connections */ #undef IPv6 |