Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / include / linux / hpet.h

diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 707f7cb9e795cb8ab5fdd0c84e7a9791605156a5..2dc29ce6c8e482da3a640290d517da90a525e422 100644 (file)
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -115,9 +115,6 @@ static inline void hpet_reserve_timer(struct hpet_data *hd, int timer)
 }
 
 int hpet_alloc(struct hpet_data *);
-int hpet_register(struct hpet_task *, int);
-int hpet_unregister(struct hpet_task *);
-int hpet_control(struct hpet_task *, unsigned int, unsigned long);
 
 #endif /* __KERNEL__ */