summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/ppc/boot/simple/mpc52xx_tty.c1
-rw-r--r--arch/ppc/syslib/mpc52xx_setup.c1
-rw-r--r--arch/ppc/syslib/todc_time.c3
-rw-r--r--include/asm-ppc/time.h3
4 files changed, 5 insertions, 3 deletions
diff --git a/arch/ppc/boot/simple/mpc52xx_tty.c b/arch/ppc/boot/simple/mpc52xx_tty.c
index 8a1c663e758c..efde532b41e0 100644
--- a/arch/ppc/boot/simple/mpc52xx_tty.c
+++ b/arch/ppc/boot/simple/mpc52xx_tty.c
@@ -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
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.
diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h
index 73f4fcd5555b..ce09b47fa819 100644
--- a/include/asm-ppc/time.h
+++ b/include/asm-ppc/time.h
@@ -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>