From: Andres Salomon Date: Sat, 25 Sep 2010 02:14:38 +0000 (-0700) Subject: staging: olpc_dcon: drop XO-1.5 support for now X-Git-Tag: firefly_0821_release~7613^2~3583^2~3^2~466 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f0753b8a908dd641144b314d7028af880f376a6;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index 02a4502961dd..808273db773c 100644 --- 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;