xserver-xorg-video-openchrome: Changes to 'upstream-unstable'

[Raphael Geissert <atomo64-guest@alioth.debian.org>]

 src/via_driver.c |    1 -
 src/via_swov.c   |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit da2e50a6485667c0d2c5fc1b2b15610523c705ef
Author: ben <ben@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date:   Sun Jun 15 22:17:42 2008 +0000

     VM800/CN700 appears to have a CLE video engine (reported by Vincent Magnin).
    
    
    git-svn-id: http://svn.openchrome.org/svn/trunk@577 e8d65cb0-85f4-0310-8831-c60e2a5ce829

diff --git a/src/via_driver.c b/src/via_driver.c
index e51ed8e..0287e78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -824,7 +824,6 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
             pVia->DRIIrqEnable = FALSE;
             break;
         case VIA_VM800:
-            pVia->VideoEngine = VIDEO_ENGINE_CME;
             pVia->agpEnable = FALSE;
             break;
         case VIA_K8M890:

commit 48a5888fcb96eb619891de62f101181c81299b52
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date:   Fri Jun 13 19:31:32 2008 +0000

    fix typo
    
    git-svn-id: http://svn.openchrome.org/svn/trunk@576 e8d65cb0-85f4-0310-8831-c60e2a5ce829

diff --git a/src/via_swov.c b/src/via_swov.c
index 1806c0e..2a13419 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
      * FIXME:
      * Enable video on secondary 
      */
-    if (pVia->VideoEngine == VIDEO_ENGINE_CME;
+    if (pVia->VideoEngine == VIDEO_ENGINE_CME
         && pVia->pBIOSInfo->PanelActive) {
         /* V1_ON_SND_DISPLAY */
         vidCtl |= 0x80000000;