summaryrefslogtreecommitdiffstats
path: root/arch/um/include/time_user.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-13 19:11:44 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-13 19:11:44 -0400
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /arch/um/include/time_user.h
parente9dd2561793c05d70c9df1bc16a2dde6f23388df (diff)
parent327309e899662b482c58cf25f574513d38b5788c (diff)
downloadop-kernel-dev-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
op-kernel-dev-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.gz
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'arch/um/include/time_user.h')
-rw-r--r--arch/um/include/time_user.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/time_user.h b/arch/um/include/time_user.h
index f64ef77..17d7ef2 100644
--- a/arch/um/include/time_user.h
+++ b/arch/um/include/time_user.h
@@ -10,6 +10,7 @@ extern void timer(void);
extern void switch_timers(int to_real);
extern void idle_sleep(int secs);
extern void enable_timer(void);
+extern void prepare_timer(void * ptr);
extern void disable_timer(void);
extern unsigned long time_lock(void);
extern void time_unlock(unsigned long);
OpenPOWER on IntegriCloud