ppc32: Fixup <asm/time.h> includes
PATCH 1/1 ppc32: Fixup <asm/time.h> includes
include/asm-ppc/time.h has a slightly odd include list which means that some files include <asm/time.h> and also hope to get others that they really shouldn't be. This makes <asm/time.h> use <linux/types.h> (time_t) and <linux/rtc.h> (struct rtc_time) instead of <linux/mc16818rtc.h>, and fixes up the fallout from the change.
Compile-tested on lite5200, walnut and defconfig, along with by-hand'ing everything else that included <asm/time.h>.
Signed-off-by Tom Rini <[email protected]>
arch/ppc/boot/simple/mpc52xx_tty.c +1 -0
@@ -17,6 +17,7 @@#include <asm/mpc52xx.h> #include <asm/mpc52xx_psc.h> #include <asm/serial.h> +#include <asm/io.h> #include <asm/time.h> #if MPC52xx_PF_CONSOLE_PORT ==0
arch/ppc/syslib/mpc52xx_setup.c +1 -0
@@ -19,6 +19,7 @@#include <linux/config.h> +#include <asm/io.h> #include <asm/time.h> #include <asm/mpc52xx.h> #include <asm/mpc52xx_psc.h>
arch/ppc/syslib/todc_time.c +1 -2
@@ -18,6 +18,7 @@#include <linux/time.h> #include <linux/timex.h> #include <linux/bcd.h> +#include <linux/mc146818rtc.h> #include <asm/machdep.h> #include <asm/io.h>
@@ -47,8 +48,6 @@* we set the 'R' bit before reading them, they basically stop counting. * --MAG */ - -extern spinlock_t rtc_lock;/* * 'todc_info' should be initialized in your *_setup.c file to
include/asm-ppc/time.h +2 -1
@@ -10,7 +10,8 @@#define __ASM_TIME_H__#include <linux/config.h> -#include <linux/mc146818rtc.h> +#include <linux/types.h> +#include <linux/rtc.h> #include <linux/threads.h> #include <asm/reg.h>
Signature · 2 lines
Tom Rini http://gate.crashing.org/~trini/