From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH 3/3] Disable linux-omap version of menelaus
Date: Fri, 23 Jan 2009 11:23:25 -0800
Message-ID: <20090123192323.GX7172@atomide.com>
References: <20090122131602.18315.84862.stgit@tikku> <20090122131920.18315.68032.stgit@tikku> <20090122131509.GH9233@scadufax.research.nokia.com> <20090123022334.GN7172@atomide.com> <20090123192144.GZ440@frodo>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-omap-owner@vger.kernel.org>
Received: from mho-01-bos.mailhop.org ([63.208.196.178]:60972 "EHLO
	mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751383AbZAWTXb (ORCPT
	<rfc822;linux-omap@vger.kernel.org>); Fri, 23 Jan 2009 14:23:31 -0500
Content-Disposition: inline
In-Reply-To: <20090123192144.GZ440@frodo>
Sender: linux-omap-owner@vger.kernel.org
List-Id: linux-omap@vger.kernel.org
To: Felipe Balbi <me@felipebalbi.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>, ext Kalle Valo <kalle.valo@nokia.com>, linux-omap@vger.kernel.org

* Felipe Balbi <me@felipebalbi.com> [090123 11:22]:
> On Thu, Jan 22, 2009 at 06:23:34PM -0800, Tony Lindgren wrote:
> > * Felipe Balbi <felipe.balbi@nokia.com> [090122 05:27]:
> > > On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote:
> > > > Fixes linker errors like this:
> > > > 
> > > > drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
> > > > lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
> > > > drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
> > > > drivers/i2c/built-in.o: In function `menelaus_set_vio':
> > > > lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'
> > > > 
> > > > Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> > > > ---
> > > > 
> > > >  drivers/i2c/chips/Makefile |    1 -
> > > >  1 files changed, 0 insertions(+), 1 deletions(-)
> > > > 
> > > > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
> > > > index b451369..d8bef8c 100644
> > > > --- a/drivers/i2c/chips/Makefile
> > > > +++ b/drivers/i2c/chips/Makefile
> > > > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
> > > >  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
> > > >  obj-$(CONFIG_PCF8575)		+= pcf8575.o
> > > >  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
> > > > -obj-$(CONFIG_MENELAUS)		+= menelaus.o
> > 
> > I'll also remove drivers/i2c/chips/menelaus.c.
> 
> why, did this driver make its way to mainline with a different name then
> ??
> 
> Where did Jean move it ?

Dave has been busy again.. 88e75cc347f66bc20e3c2b920431fc07253d69be.

Tony