openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andres Salomon 2010-09-24 19:14:38 -07:00 committed by Greg Kroah-Hartman
parent 316604bef6
commit 5f0753b8a9
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/olpc_dcon/olpc_dcon.c
View File

@ -869,21 +869,11 @@ static struct i2c_driver dcon_driver = {
#endif #endif
}; };
#if defined(CONFIG_OLPC_XO_1)
#include "olpc_dcon_xo_1.c" #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) static int __init olpc_dcon_init(void)
{ {
#ifdef CONFIG_OLPC_XO_1
pdata = &dcon_pdata_xo_1; pdata = &dcon_pdata_xo_1;
#else
pdata = &dcon_pdata_xo_1_5;
#endif
i2c_add_driver(&dcon_driver); i2c_add_driver(&dcon_driver);
return 0; return 0;