public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kalle.valo@nokia.com>
To: linux-omap@vger.kernel.org
Subject: [PATCH 3/3] Disable linux-omap version of menelaus
Date: Thu, 22 Jan 2009 15:19:20 +0200	[thread overview]
Message-ID: <20090122131920.18315.68032.stgit@tikku> (raw)
In-Reply-To: <20090122131602.18315.84862.stgit@tikku>

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
 obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
 obj-$(CONFIG_TWL4030_POWEROFF)	+= twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)	+= twl4030-pwrbutton.o


  parent reply	other threads:[~2009-01-22 13:19 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-22 13:18 [PATCH 0/3] Hacks to make Nokia N800 compile Kalle Valo
2009-01-22 13:19 ` [PATCH 1/3] n800-bt: include board-nokia.h Kalle Valo
2009-01-23  2:10   ` Tony Lindgren
2009-01-22 13:19 ` [PATCH 2/3] tsub6010: fix omap compile Kalle Valo
2009-01-23  2:10   ` Tony Lindgren
2009-01-23 12:14     ` Felipe Balbi
2009-01-23 14:04       ` Kalle Valo
2009-01-23 13:57         ` Felipe Balbi
2009-01-22 13:19 ` Kalle Valo [this message]
2009-01-22 13:15   ` [PATCH 3/3] Disable linux-omap version of menelaus Felipe Balbi
2009-01-23  2:23     ` Tony Lindgren
2009-01-23 19:21       ` Felipe Balbi
2009-01-23 19:23         ` Tony Lindgren
2009-01-23 19:27           ` Felipe Balbi
2009-01-26 11:35       ` Kalle Valo
2009-01-26 21:40         ` David Brownell
2009-01-26 21:52           ` Tony Lindgren
2009-01-26 23:17             ` David Brownell
2009-01-26 23:19               ` Felipe Balbi
2009-01-26 23:27                 ` Tony Lindgren
2009-01-26 23:31                   ` Felipe Balbi
2009-01-22 20:53 ` [PATCH 0/3] Hacks to make Nokia N800 compile green

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090122131920.18315.68032.stgit@tikku \
    --to=kalle.valo@nokia.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox