* linux-next: build failure after merge of the final tree (mfd tree related)
@ 2011-03-28 3:52 Stephen Rothwell
2011-03-28 4:26 ` [PATCH] MFD: allow cs5535-mfd to build on X86 only Andres Salomon
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-03-28 3:52 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Andres Salomon
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] MFD: allow cs5535-mfd to build on X86 only
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
2011-03-28 5:30 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Andres Salomon @ 2011-03-28 4:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MFD: allow cs5535-mfd to build on X86 only
2011-03-28 4:26 ` [PATCH] MFD: allow cs5535-mfd to build on X86 only Andres Salomon
@ 2011-03-28 5:30 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-03-28 5:30 UTC (permalink / raw)
To: Linus; +Cc: Samuel Ortiz, linux-next, linux-kernel, Andres Salomon
Hi Linus,
This is relevant to one of the trees that you merged today:
On Sun, 27 Mar 2011 21:26:03 -0700 Andres Salomon <dilinger@queued.net> wrote:
>
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
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-28 5:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH] MFD: allow cs5535-mfd to build on X86 only Andres Salomon
2011-03-28 5:30 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox