staging: olpc_dcon: drop XO-1.5 support for now

The vx855 stuff isn't upstream yet; for now, drop support for XO-1.5.
This will come back once the 1.5 code is in place (and will be in a form
that allows both 1.0 and 1.5 support to be compiled in at the same time),
but for now just remove it.  This is necessary to get the driver building.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 02a4502961ddbb1815d14d815f291279179b48ea..808273db773cd3b7e2665ec0d378da1c9a1cfa92 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/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;