* Don't pretend the object passed to clockattach is a device - it isn't.

* Declare itc_frequency properly.

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index 3bc8ace..a609bc7 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -71,7 +71,7 @@
  */
 #define	LEAPYEAR(y)	(((y) % 4) == 0)
 
-device_t clockdev;
+kobj_t clockdev;
 int clockinitted;
 int tickfix;
 int tickfixinterval;
@@ -80,7 +80,7 @@ int	disable_rtc_set;	/* disable resettodr() if != 0 */
 int	wall_cmos_clock;	/* wall	CMOS clock assumed if != 0 */
 static	int	beeping = 0;
 
-extern u_char itc_frequency;
+extern u_int64_t itc_frequency;
 
 static timecounter_get_t	ia64_get_timecount;
 
@@ -122,7 +122,7 @@ static u_int32_t last_time;
 static u_int32_t calibrate_clocks(u_int32_t firmware_freq);
 
 void
-clockattach(device_t dev)
+clockattach(kobj_t dev)
 {
 
 	/*
diff --git a/sys/ia64/ia64/clock_if.m b/sys/ia64/ia64/clock_if.m
index 9665135..6df1661 100644
--- a/sys/ia64/ia64/clock_if.m
+++ b/sys/ia64/ia64/clock_if.m
@@ -32,21 +32,21 @@
 INTERFACE clock;
 
 METHOD void init {
-	device_t dev;
+	kobj_t dev;
 };
 
 METHOD void get {
-	device_t dev;
+	kobj_t dev;
 	time_t base;
 	struct clocktime *ct;
 };
 
 METHOD void set {
-	device_t dev;
+	kobj_t dev;
 	struct clocktime *ct;
 };
 
 METHOD int getsecs {
-	device_t dev;
+	kobj_t dev;
 	int *secp;
 };