From 3b3ef8a6a899e128b7e264c274be33935879f4e9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Wed, 16 Sep 2009 20:45:09 +1000
Subject: [PATCH] --- yaml --- r: 166524 b: refs/heads/master c:
 f80330357284c908e1f67cc8b4d8e56a3e2f6fc6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fcad3c48c4a3..1dfae72a1e58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 513bcb4655e68706594e45dfa1d4b181500110ba
+refs/heads/master: f80330357284c908e1f67cc8b4d8e56a3e2f6fc6
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index a85c818be945..750c71f141f4 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -1789,7 +1789,7 @@ static int __init video_setup(char *options)
  		global = 1;
  	}
 
- 	if (!global && !strstr(options, "fb:")) {
+ 	if (!global && !strchr(options, ':')) {
  		fb_mode_option = options;
  		global = 1;
  	}