2009-01-30 18:42:41

by Mark Brown

Subject: [PATCH] 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 <[email protected]>
---
drivers/mfd/twl4030-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index e7ab003..68826f1 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

--
1.5.6.3

2009-01-30 19:46:28

by David Brownell

Subject: Re: [PATCH] mfd: Fix TWL4030 build on some ARM variants

On Friday 30 January 2009, Mark Brown wrote:
> 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 <[email protected]>

Acked-by: David Brownell <[email protected]>


> ---
> drivers/mfd/twl4030-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> index e7ab003..68826f1 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
>
> --
> 1.5.6.3
>
>