Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0753b8 authored by Andres Salomon's avatar Andres Salomon Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 316604be

drivers/staging/olpc_dcon/olpc_dcon.c

+0 −10
Original line number Diff line number Diff line
@@ -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;