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

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

 src/via_driver.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0aa55a939fbc214dacd40c82bd39c252125c9a80
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date:   Sun May 25 21:50:28 2008 +0000

    replace xf86strstr by the unwrapped version
    
    git-svn-id: http://svn.openchrome.org/svn/trunk@570 e8d65cb0-85f4-0310-8831-c60e2a5ce829

diff --git a/src/via_driver.c b/src/via_driver.c
index 639c642..26f85da 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1338,13 +1338,13 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     /* ActiveDevice Option for device selection */
     //pVia->ActiveDevice = 0x00;
     if ((s = xf86GetOptValString(VIAOptions, OPTION_ACTIVEDEVICE))) {
-        if (xf86strstr(s, "CRT"))
+        if (strstr(s, "CRT"))
             pVia->ActiveDevice |= VIA_DEVICE_CRT;
-        if (xf86strstr(s, "LCD"))
+        if (strstr(s, "LCD"))
             pVia->ActiveDevice |= VIA_DEVICE_LCD;
-        if (xf86strstr(s, "DFP"))  /* just treat this the same as LCD */
+        if (strstr(s, "DFP"))  /* just treat this the same as LCD */
             pVia->ActiveDevice |= VIA_DEVICE_LCD;
-        if (xf86strstr(s, "TV"))
+        if (strstr(s, "TV"))
             pVia->ActiveDevice |= VIA_DEVICE_TV;
     }