diff options
author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-08-12 17:54:19 +0200 |
---|---|---|
committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-08-12 17:54:19 +0200 |
commit | 6910535d75d9a8197a414794c4595b069adc27bd (patch) | |
tree | c51fbe15f5cc87d4e76050db9a9d6e2bbc46dbbf /src/gfx/gfx_mode.h | |
parent | 76cd88877be9f4663ce5d8620e01a2325b72a88d (diff) | |
parent | 0e64b1252c51e380f72f6ff0bdb6836a6e27071d (diff) |
Merge remote-tracking branch 'origin/master' into obsd
Conflicts:
src/geode_msr.c
Diffstat (limited to 'src/gfx/gfx_mode.h')
-rw-r--r-- | src/gfx/gfx_mode.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gfx/gfx_mode.h b/src/gfx/gfx_mode.h index f9b42b0..a38bc73 100644 --- a/src/gfx/gfx_mode.h +++ b/src/gfx/gfx_mode.h @@ -127,8 +127,7 @@ /* STRUCTURE DEFINITION */ -typedef struct tagDISPLAYMODE -{ +typedef struct tagDISPLAYMODE { /* DISPLAY MODE FLAGS */ /* Specify valid color depths and the refresh rate. */ @@ -157,8 +156,7 @@ typedef struct tagDISPLAYMODE } DISPLAYMODE; /* For Fixed timings */ -typedef struct tagFIXEDTIMINGS -{ +typedef struct tagFIXEDTIMINGS { /* DISPLAY MODE FLAGS */ /* Specify valid color depths and the refresh rate. */ @@ -189,6 +187,6 @@ typedef struct tagFIXEDTIMINGS } FIXEDTIMINGS; -#endif /* !_gfx_mode_h */ +#endif /* !_gfx_mode_h */ /* END OF FILE */ |