linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jingoo Han <jg1.han@samsung.com>
Subject: linux-next: build failure after merge of the final tree (akpm tree related)
Date: Fri, 1 Jul 2011 15:45:08 +1000	[thread overview]
Message-ID: <20110701154508.92c8b685.sfr@canb.auug.org.au> (raw)

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/video/backlight/ams369fg06.o:(.bss+0x510): multiple definition of `before_power'
drivers/video/backlight/s6e63m0.o:(.bss+0x5e0): first defined here

Caused by commit 45193c8486ef ("Add the ams369fg06 amoled panel driver.
The ams369fg06 amoled panel (480").  The variable should probably be
static in both files.

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 1 Jul 2011 15:34:22 +1000
Subject: [PATCH] backlight: make some varibales static

fixes this build error:

drivers/video/backlight/ams369fg06.o:(.bss+0x510): multiple definition of `before_power'
drivers/video/backlight/s6e63m0.o:(.bss+0x5e0): first defined here

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/video/backlight/ams369fg06.c |    2 +-
 drivers/video/backlight/s6e63m0.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 86a7daf..d1d8237 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -560,7 +560,7 @@ static int __devexit ams369fg06_remove(struct spi_device *spi)
 }
 
 #if defined(CONFIG_PM)
-unsigned int before_power;
+static unsigned int before_power;
 
 static int ams369fg06_suspend(struct spi_device *spi, pm_message_t mesg)
 {
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index 322040f..e1803ba 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -840,7 +840,7 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
 }
 
 #if defined(CONFIG_PM)
-unsigned int before_power;
+static unsigned int before_power;
 
 static int s6e63m0_suspend(struct spi_device *spi, pm_message_t mesg)
 {
-- 
1.7.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

             reply	other threads:[~2011-07-01  5:45 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01  5:45 Stephen Rothwell [this message]
2011-07-27  3:55 linux-next: build failure after merge of the final tree (akpm tree related) Stephen Rothwell
2011-09-28 10:01 Stephen Rothwell
2011-09-30  1:52 Stephen Rothwell
2011-10-05  8:23 Stephen Rothwell
2011-11-30  4:42 Stephen Rothwell
2011-11-30  5:16 ` Andrew Morton
2011-11-30  4:52 Stephen Rothwell
2011-11-30  5:40 ` David Miller
2011-11-30  6:07   ` Andrew Morton
2011-11-30 11:48     ` Neil Horman
2011-12-17  4:42 Stephen Rothwell
2011-12-17  5:02 ` NeilBrown
2012-01-20  2:02 Stephen Rothwell
2012-02-17  5:30 Stephen Rothwell
2012-02-17  6:07 ` Benjamin Herrenschmidt
2012-02-17 10:20 Stephen Rothwell
2012-02-17 12:06 ` Konstantin Khlebnikov
2012-02-19 23:04 ` Stephen Rothwell
2012-02-19 23:15   ` Andrew Morton
2012-03-14 23:44 Stephen Rothwell
2012-05-11  6:20 Stephen Rothwell
2012-09-13  8:01 Stephen Rothwell
2012-09-13 10:01 ` Shaohua Li
2012-09-13 12:29   ` Stephen Rothwell
2012-09-13  8:11 Stephen Rothwell
2012-09-13 13:24 ` David Fries
2012-09-13 13:34   ` Stephen Rothwell
2012-09-14  4:20     ` David Fries
2012-09-17 11:49 Stephen Rothwell
2012-11-09  3:58 Stephen Rothwell
2012-11-09  4:01 ` Andrew Morton
2012-11-12  0:00   ` Stephen Rothwell
2012-11-09  4:09 Stephen Rothwell
2012-11-14 22:18 ` Andrew Morton
2012-11-14 22:30   ` David Miller
2012-11-14 23:09     ` Andrew Morton
2012-11-14 23:10       ` David Miller
2012-11-09  4:16 Stephen Rothwell
2013-01-21  6:08 Stephen Rothwell
2013-01-21  7:17 ` Tang Chen
2013-01-24  5:54 Stephen Rothwell
2013-01-24 10:30 ` Shaohua Li
2013-01-24 23:22   ` Stephen Rothwell
2013-03-04  3:10 Stephen Rothwell
2013-03-06 23:52 ` Andrew Morton
2013-03-04  3:28 Stephen Rothwell
2013-03-04  9:22 ` Jan Kara
2013-06-06  6:18 Stephen Rothwell
2013-06-06  7:15 Stephen Rothwell
2013-06-06  7:25 Stephen Rothwell

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=20110701154508.92c8b685.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=jg1.han@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@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;
as well as URLs for NNTP newsgroup(s).