diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
| commit | 2c6d47108880584f1221ff86c6c8947627f9f607 (patch) | |
| tree | 64a042f58df056433c430fb0c99735d9e8c0904d /hw/xfree86/parser/Screen.c | |
| parent | c4fe1bcce1c1e4822e688959b331b47a051d6e0a (diff) | |
| parent | 85220446359a75ea2c359b418b4051c04eea739c (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
Diffstat (limited to 'hw/xfree86/parser/Screen.c')
| -rw-r--r-- | hw/xfree86/parser/Screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index b7a64b035..79e1d24ef 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -83,7 +83,7 @@ static xf86ConfigSymTabRec DisplayTab[] = #define CLEANUP xf86freeDisplayList -XF86ConfDisplayPtr +static XF86ConfDisplayPtr xf86parseDisplaySubSection (void) { int token; |