xserver: Branch 'master'

[Matthias Hopf]

 hw/xfree86/modes/xf86Crtc.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 27b13eeb56a5cbac00b381309604505002e77228
Author: Matthias Hopf <mhopf at suse.de>
Date:   Fri Oct 26 13:15:07 2007 +0200

    Nuke superfluous ",", added missing include for xf86i2c.h.

diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 4c843cd..f312b30 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -29,6 +29,7 @@
 #endif
 #include "xf86Modes.h"
 #include "xf86Cursor.h"
+#include "xf86i2c.h"
 #include "damage.h"
 #include "picturestr.h"
 
@@ -60,13 +61,13 @@ typedef enum _xf86ConnectorType {
    XF86ConnectorSvideo,
    XF86ConnectorComponent,
    XF86ConnectorLFP,
-   XF86ConnectorProprietary,
+   XF86ConnectorProprietary
 } xf86ConnectorType;
 
 typedef enum _xf86OutputStatus {
    XF86OutputStatusConnected,
    XF86OutputStatusDisconnected,
-   XF86OutputStatusUnknown,
+   XF86OutputStatusUnknown
 } xf86OutputStatus;
 
 typedef struct _xf86CrtcFuncs {