diff --git a/[refs] b/[refs] index 2c6aca63ee83..5681edb7da72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7498081a6f5d96c9f3243b6b5e020352903bfd2 +refs/heads/master: e34456825de0d3ac4c4e8fe0bdc6b599404ea06f diff --git a/trunk/arch/sparc/include/asm/of_device.h b/trunk/arch/sparc/include/asm/of_device.h index e5f5aedc2293..bba777a416d3 100644 --- a/trunk/arch/sparc/include/asm/of_device.h +++ b/trunk/arch/sparc/include/asm/of_device.h @@ -30,8 +30,7 @@ struct of_device extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); -/* These are just here during the transition */ -#include +/* This is just here during the transition */ #include #endif /* __KERNEL__ */