Merge ath-next from ath.git

[deliverable/linux.git] / include / linux / mISDNif.h

diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 246a3529ecf644d67d3036d823a7c89ad0881f06..ac02c54520e9733096ec984f3efe98b909182bfd 100644 (file)
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -596,7 +596,7 @@ static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
 }
 
 extern void    set_channel_address(struct mISDNchannel *, u_int, u_int);
-extern void    mISDN_clock_update(struct mISDNclock *, int, struct timeval *);
+extern void    mISDN_clock_update(struct mISDNclock *, int, ktime_t *);
 extern unsigned short mISDN_clock_get(void);
 extern const char *mISDNDevName4ch(struct mISDNchannel *);