linux-next: build failure after merge of the final tree (mfd tree related)
Subsystems (2)
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).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 MFD: allow cs5535-mfd to build on X86 only
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.
---
Quoted 8 lines · On Mon, 28 Mar 2011 14:52:12 +1100 Stephen Rothwell <[email protected]>…
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
Quoted 6 lines
Caused by commit
fa1df691688f("mfd: Addmfd_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(-)
drivers/mfd/Kconfig +1 -1
@@ -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.
Signature · 1 line
1.7.2.5
Re: [PATCH] MFD: allow cs5535-mfd to build on X86 only
Hi Linus,
This is relevant to one of the trees that you merged today:
Quoted 1 line · On Sun, 27 Mar 2011 21:26:03 -0700 Andres Salomon <[email protected]> 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.
---
Quoted 8 lines · On Mon, 28 Mar 2011 14:52:12 +1100 Stephen Rothwell <[email protected]>…
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
Quoted 6 lines
Caused by commit
fa1df691688f("mfd: Addmfd_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(-)
drivers/mfd/Kconfig +1 -1
@@ -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.
Signature · 6 lines
1.7.2.5 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/