summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-03-27 21:26:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-28 07:51:42 -0700
commit15b7cf1416c0e3ae6163ade3349d717fe2729952 (patch)
tree1f06ff7b68e41b5550dffd9939e16a2f5be9ec9e
parent7e599e6e62759e057e902fcf9a05ba24f6155bcd (diff)
downloadop-kernel-dev-15b7cf1416c0e3ae6163ade3349d717fe2729952.zip
op-kernel-dev-15b7cf1416c0e3ae6163ade3349d717fe2729952.tar.gz
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. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mfd/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e986f91..9a46d64 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -592,7 +592,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.
OpenPOWER on IntegriCloud