diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2004-11-07 03:40:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-07 03:40:40 -0800 |
| commit | 1d5057cff42b6337b8ee460f8a244fc887d4bfa2 (patch) | |
| tree | 1bb29ed65fc12a0c9470e3d72456b93c063dddab /arch/ppc/syslib | |
| parent | c720ddc1d2ff52b3fca113ef17611dfa7da661c1 (diff) | |
[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: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib')
| -rw-r--r-- | arch/ppc/syslib/mpc52xx_setup.c | 1 | ||||
| -rw-r--r-- | arch/ppc/syslib/todc_time.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c index d73e6fea542b..6bd014d7c9dc 100644 --- a/arch/ppc/syslib/mpc52xx_setup.c +++ b/arch/ppc/syslib/mpc52xx_setup.c @@ -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> diff --git a/arch/ppc/syslib/todc_time.c b/arch/ppc/syslib/todc_time.c index 1dc7e0bf5316..6730695c35fa 100644 --- a/arch/ppc/syslib/todc_time.c +++ b/arch/ppc/syslib/todc_time.c @@ -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> @@ -48,8 +49,6 @@ * --MAG */ -extern spinlock_t rtc_lock; - /* * 'todc_info' should be initialized in your *_setup.c file to * point to a fully initialized 'todc_info_t' structure. |