| Message ID | 1397788215-20279-8-git-send-email-elder@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 17, 2014 at 09:30:12PM -0500, Alex Elder wrote: > Clean up a few header file includes, eliminating a few that are not > really needed and putting in their place some that are. > > Signed-off-by: Alex Elder <elder@linaro.org> > Reviewed-by: Matt Porter <mporter@linaro.org> > --- > arch/arm/mach-bcm/board_bcm21664.c | 3 +-- > arch/arm/mach-bcm/kona.c | 5 +++-- > arch/arm/mach-bcm/kona.h | 1 + > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c > index acc1573..ab96c3f 100644 > --- a/arch/arm/mach-bcm/board_bcm21664.c > +++ b/arch/arm/mach-bcm/board_bcm21664.c > @@ -11,13 +11,12 @@ > * GNU General Public License for more details. > */ > > -#include <linux/clocksource.h> > #include <linux/of_address.h> > #include <linux/of_platform.h> > > #include <asm/mach/arch.h> > +#include <asm/io.h> It's linux/io.h > diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h > index 110185f..bcdcf06 100644 > --- a/arch/arm/mach-bcm/kona.h > +++ b/arch/arm/mach-bcm/kona.h > @@ -12,6 +12,7 @@ > */ > > #ifdef CONFIG_ARCH_BCM_MOBILE_L2_CACHE > +#include <linux/init.h> > > void __init kona_l2_cache_init(void); Just get rid of the __init instead.
On 04/18/2014 03:29 AM, Russell King - ARM Linux wrote: > On Thu, Apr 17, 2014 at 09:30:12PM -0500, Alex Elder wrote: >> Clean up a few header file includes, eliminating a few that are not >> really needed and putting in their place some that are. >> >> Signed-off-by: Alex Elder <elder@linaro.org> >> Reviewed-by: Matt Porter <mporter@linaro.org> >> --- >> arch/arm/mach-bcm/board_bcm21664.c | 3 +-- >> arch/arm/mach-bcm/kona.c | 5 +++-- >> arch/arm/mach-bcm/kona.h | 1 + >> 3 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c >> index acc1573..ab96c3f 100644 >> --- a/arch/arm/mach-bcm/board_bcm21664.c >> +++ b/arch/arm/mach-bcm/board_bcm21664.c >> @@ -11,13 +11,12 @@ >> * GNU General Public License for more details. >> */ >> >> -#include <linux/clocksource.h> >> #include <linux/of_address.h> >> #include <linux/of_platform.h> >> >> #include <asm/mach/arch.h> >> +#include <asm/io.h> > > It's linux/io.h Fixed, as you'll see when I post v2 later. >> diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h >> index 110185f..bcdcf06 100644 >> --- a/arch/arm/mach-bcm/kona.h >> +++ b/arch/arm/mach-bcm/kona.h >> @@ -12,6 +12,7 @@ >> */ >> >> #ifdef CONFIG_ARCH_BCM_MOBILE_L2_CACHE >> +#include <linux/init.h> >> >> void __init kona_l2_cache_init(void); > > Just get rid of the __init instead. Because __init is a "section" attribute, which affects code and not the prototype. That's great, thanks a lot. -Alex
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c index acc1573..ab96c3f 100644 --- a/arch/arm/mach-bcm/board_bcm21664.c +++ b/arch/arm/mach-bcm/board_bcm21664.c @@ -11,13 +11,12 @@ * GNU General Public License for more details. */ -#include <linux/clocksource.h> #include <linux/of_address.h> #include <linux/of_platform.h> #include <asm/mach/arch.h> +#include <asm/io.h> -#include "bcm_kona_smc.h" #include "kona.h" #define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr" diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c index 60b5dd5..b319703 100644 --- a/arch/arm/mach-bcm/kona.c +++ b/arch/arm/mach-bcm/kona.c @@ -11,11 +11,12 @@ * GNU General Public License for more details. */ -#include <linux/of_platform.h> + +#include <linux/init.h> +#include <linux/printk.h> #include <asm/hardware/cache-l2x0.h> #include "bcm_kona_smc.h" -#include "kona.h" void __init kona_l2_cache_init(void) { diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h index 110185f..bcdcf06 100644 --- a/arch/arm/mach-bcm/kona.h +++ b/arch/arm/mach-bcm/kona.h @@ -12,6 +12,7 @@ */ #ifdef CONFIG_ARCH_BCM_MOBILE_L2_CACHE +#include <linux/init.h> void __init kona_l2_cache_init(void); #else