From: Andres Salomon <dilinger@queued.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] MFD: allow cs5535-mfd to build on X86 only
Date: Sun, 27 Mar 2011 21:26:03 -0700 [thread overview]
Message-ID: <20110327212603.209ad054@queued.net> (raw)
In-Reply-To: <20110328145212.8ed636e8.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1696 bytes --]
Stephen ran into the following build error:
drivers/mfd/cs5535-mfd.c:30:22: error: asm/olpc.h: No such file or
directory
olpc.h exists only on x86 (and in the future, ARM). Rather than
wrapping the include in an #ifdef, just change cs5535-mfd to only build
on x86.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
On Mon, 28 Mar 2011 14:52:12 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/mfd/cs5535-mfd.c:30:22: error: asm/olpc.h: No such file or
> directory
>
> Caused by commit fa1df691688f ("mfd: Add mfd_clone_cell(), convert
> cs5535-mfd/olpc-xo1 to it").
>
> I have reverted that commit (and commit adfa4bd4a8bf "mfd: OLPC:
> Clean up names to match what OLPC actually uses" that conflicted with
> the revert).
Whoops, this should fix it. One could argue that we should allow this
to build on MIPS as well, but.. we'll cross that bridge later. Thanks!
drivers/mfd/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a9a1af4..3fbeb3b 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -591,7 +591,7 @@ config AB3550_CORE
config MFD_CS5535
tristate "Support for CS5535 and CS5536 southbridge core functions"
select MFD_CORE
- depends on PCI
+ depends on PCI && X86
---help---
This is the core driver for CS5535/CS5536 MFD functions. This is
necessary for using the board's GPIO and MFGPT functionality.
--
1.7.2.5
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2011-03-28 4:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 3:52 linux-next: build failure after merge of the final tree (mfd tree related) Stephen Rothwell
2011-03-28 4:26 ` Andres Salomon [this message]
2011-03-28 5:30 ` [PATCH] MFD: allow cs5535-mfd to build on X86 only 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=20110327212603.209ad054@queued.net \
--to=dilinger@queued.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.