diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-17 15:00:54 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-17 15:00:54 -0400 |
| commit | c3f7b862550fa8f46633162f83db8c27e46fc672 (patch) | |
| tree | a8427c93c96af2bbf2133b07f2510ff31560e54d /hw/xfree86/common/xf86Config.h | |
| parent | af4dde0ac19ecec1d0ad988eb25b15401e7c6b36 (diff) | |
| parent | feac0759522cbdc3e61ccfa373df735903c5cb27 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
os/access.c
Diffstat (limited to 'hw/xfree86/common/xf86Config.h')
| -rw-r--r-- | hw/xfree86/common/xf86Config.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index b8b5fd42a..a174e463b 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -34,6 +34,8 @@ #define _xf86_config_h #include "xf86Optrec.h" +#include "xf86Parser.h" +#include "xf86str.h" #ifdef HAVE_PARSER_DECLS /* @@ -65,5 +67,8 @@ Bool xf86BuiltinInputDriver(const char *); ConfigStatus xf86HandleConfigFile(Bool); Bool xf86AutoConfig(void); +GDevPtr autoConfigDevice(GDevPtr preconf_device); +char* chooseVideoDriver(void); +int xchomp(char *line); #endif /* _xf86_config_h */ |