Re: [PATCH] uartlite: Fix build on sparc.

[Grant Likely]

On Wed, Mar 3, 2010 at 3:50 AM, David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> We can get this driver enabled via MFD_TIMBERDALE which only
> requires GPIO to be on.
>
> But the of_address_to_resource() function is only present on
> powerpc and microblaze, so we have to conditionalize the
> CONFIG_OF probing bits on that.
>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

Linus or Greg, can you please pick this bug fix up?

Thanks,
g.

>
> diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
> index ab2ab3c..f0a6c61 100644
> --- a/drivers/serial/uartlite.c
> +++ b/drivers/serial/uartlite.c
> @@ -19,7 +19,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/init.h>
>  #include <asm/io.h>
> -#if defined(CONFIG_OF)
> +#if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE))
>  #include <linux/of.h>
>  #include <linux/of_device.h>
>  #include <linux/of_platform.h>
> @@ -581,7 +581,7 @@ static struct platform_driver ulite_platform_driver = {
>  /* ---------------------------------------------------------------------
>  * OF bus bindings
>  */
> -#if defined(CONFIG_OF)
> +#if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE))
>  static int __devinit
>  ulite_of_probe(struct of_device *op, const struct of_device_id *match)
>  {
> @@ -631,11 +631,11 @@ static inline void __exit ulite_of_unregister(void)
>  {
>        of_unregister_platform_driver(&ulite_of_driver);
>  }
> -#else /* CONFIG_OF */
> -/* CONFIG_OF not enabled; do nothing helpers */
> +#else /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */
> +/* Appropriate config not enabled; do nothing helpers */
>  static inline int __init ulite_of_register(void) { return 0; }
>  static inline void __exit ulite_of_unregister(void) { }
> -#endif /* CONFIG_OF */
> +#endif /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */
>
>  /* ---------------------------------------------------------------------
>  * Module setup/teardown
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/