summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2009-02-04 21:26:07 +0100
committerSamuel Ortiz <samuel@sortiz.org>2009-02-17 09:00:13 +0100
commita313d758cc7956d7f1e7a727c8fa571b6468fabf (patch)
tree316d5c0eff392c2b87254081d8a404e618cba7df /drivers
parent29c6a2e6f88225ae2673aabd2de0fa2126653231 (diff)
downloadblackbird-op-linux-a313d758cc7956d7f1e7a727c8fa571b6468fabf.tar.gz
blackbird-op-linux-a313d758cc7956d7f1e7a727c8fa571b6468fabf.zip
mfd: Fix TWL4030 build on some ARM variants
Many ARM platforms do not provide a mach/cpu.h so rather than guarding the use of that header with CONFIG_ARM guard it with the guards used when testing for the OMAP variants in the body of the code. Signed-off-by: Mark Brown <broonie@sirena.org.uk> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/twl4030-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index e7ab0035d305..68826f1e36bc 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -38,7 +38,7 @@
#include <linux/i2c.h>
#include <linux/i2c/twl4030.h>
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
#include <mach/cpu.h>
#endif
OpenPOWER on IntegriCloud