The patch titled
mfd: fix TWL4030 build on some ARM variants
has been removed from the -mm tree. Its filename was
mfd-fix-twl4030-build-on-some-arm-variants.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mfd: fix TWL4030 build on some ARM variants
From: Mark Brown <broonie@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mfd/twl4030-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/mfd/twl4030-core.c~mfd-fix-twl4030-build-on-some-arm-variants drivers/mfd/twl4030-core.c
--- a/drivers/mfd/twl4030-core.c~mfd-fix-twl4030-build-on-some-arm-variants
+++ a/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
_
Patches currently in -mm which might be from broonie@xxxxxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
