Commit 1d5057cf authored by Tom Rini's avatar Tom Rini Committed by Linus Torvalds

[PATCH] 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: default avatarTom Rini <trini@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c720ddc1
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm/mpc52xx.h> #include <asm/mpc52xx.h>
#include <asm/mpc52xx_psc.h> #include <asm/mpc52xx_psc.h>
#include <asm/serial.h> #include <asm/serial.h>
#include <asm/io.h>
#include <asm/time.h> #include <asm/time.h>
#if MPC52xx_PF_CONSOLE_PORT == 0 #if MPC52xx_PF_CONSOLE_PORT == 0
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/io.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/mpc52xx.h> #include <asm/mpc52xx.h>
#include <asm/mpc52xx_psc.h> #include <asm/mpc52xx_psc.h>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/mc146818rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -48,8 +49,6 @@ ...@@ -48,8 +49,6 @@
* --MAG * --MAG
*/ */
extern spinlock_t rtc_lock;
/* /*
* 'todc_info' should be initialized in your *_setup.c file to * 'todc_info' should be initialized in your *_setup.c file to
* point to a fully initialized 'todc_info_t' structure. * point to a fully initialized 'todc_info_t' structure.
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
#define __ASM_TIME_H__ #define __ASM_TIME_H__
#include <linux/config.h> #include <linux/config.h>
#include <linux/mc146818rtc.h> #include <linux/types.h>
#include <linux/rtc.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <asm/reg.h> #include <asm/reg.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment