[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110210180138.6c7af1ef@queued.net>
Date: Thu, 10 Feb 2011 18:01:38 -0800
From: Andres Salomon <dilinger@...ued.net>
To: cjb@...top.org
Cc: gregkh@...e.de, linux-kernel@...r.kernel.org,
jon.nettleton@...il.com, devel@...verdev.osuosl.org, dsd@...top.org
Subject: Re: [PATCH 06/10] olpc_dcon: add config options for XO_1 and
XO_1_5, drop hardcoded XO-1 stuff
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@...ued.net> 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@...ued.net>
[...]
> 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
[...]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists