---

yaml --- r: 219981 b: refs/heads/master c: 5f0753b h: refs/heads/master i: 219979: 7f16340 v: v3
git-mirror · Sep 30, 2010 · a751ccc · a751ccc
1 parent 339356a
commit a751ccc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 316604bef6874bbd2a946fb39a7555b068c44c08
+refs/heads/master: 5f0753b8a908dd641144b314d7028af880f376a6
diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -869,21 +869,11 @@ static struct i2c_driver dcon_driver = {
 #endif
 };
 
-#if defined(CONFIG_OLPC_XO_1)
 #include "olpc_dcon_xo_1.c"
-#elif defined(CONFIG_OLPC_XO_1_5)
-#include "olpc_dcon_xo_1_5.c"
-#else
-#error "Trying to build OLPC DCON driver but kernel not configured for XO"
-#endif
 
 static int __init olpc_dcon_init(void)
 {
-#ifdef CONFIG_OLPC_XO_1
 	pdata = &dcon_pdata_xo_1;
-#else
-	pdata = &dcon_pdata_xo_1_5;
-#endif
 
 	i2c_add_driver(&dcon_driver);
 	return 0;