Note one subtlety of this patch that I should've mentioned - due to the Makefile maneuvering, the module has been renamed from olpc_dcon.ko to olpc-dcon.ko. For things like modprobe and /etc/modules, this doesn't make a difference. But, it might affect the OLPC'ers. On Thu, 10 Feb 2011 17:53:24 -0800 Andres Salomon <dilinger@xxxxxxxxxx> wrote: > > This adds CONFIG_FB_OLPC_DCON_1 and CONFIG_FB_OLPC_DCON_1_5 options > for allowing selection of XO-1 and/or XO-1.5 DCON support. In the > process, it also forces the xo_1.c and xo_1_5.c files to build as > separate units, correctly selects between XO-1 and XO-1.5 at runtime, > and adds some hacks to allow xo_1_5.c to build. > > This isn't the cleanest patch, but it'll get better as more global > variables are dropped. > > Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx> [...] > diff --git a/drivers/staging/olpc_dcon/Makefile > b/drivers/staging/olpc_dcon/Makefile index cd8f289..36c7e67 100644 > --- a/drivers/staging/olpc_dcon/Makefile > +++ b/drivers/staging/olpc_dcon/Makefile > @@ -1 +1,6 @@ > -obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon.o > +olpc-dcon-objs += olpc_dcon.o > +olpc-dcon-$(CONFIG_FB_OLPC_DCON_1) += olpc_dcon_xo_1.o > +olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5) += olpc_dcon_xo_1_5.o > +obj-$(CONFIG_FB_OLPC_DCON) += olpc-dcon.o [...] _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
