Merge remote-tracking branch 'parisc-hd/for-next'

[karo-tx-linux.git] / include / linux / hpet.h

diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 219ca4f6bea66a0a755101ea2d9c615a67854283..9427ab4e01c3594c7354380abad13e0b6e31bad0 100644 (file)
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -1,9 +1,8 @@
 #ifndef        __HPET__
 #define        __HPET__ 1
 
-#include <linux/compiler.h>
+#include <uapi/linux/hpet.h>
 
-#ifdef __KERNEL__
 
 /*
  * Offsets into HPET Registers
@@ -108,24 +107,4 @@ static inline void hpet_reserve_timer(struct hpet_data *hd, int timer)
 
 int hpet_alloc(struct hpet_data *);
 
-#endif /* __KERNEL__ */
-
-struct hpet_info {
-       unsigned long hi_ireqfreq;      /* Hz */
-       unsigned long hi_flags; /* information */
-       unsigned short hi_hpet;
-       unsigned short hi_timer;
-};
-
-#define HPET_INFO_PERIODIC     0x0010  /* periodic-capable comparator */
-
-#define        HPET_IE_ON      _IO('h', 0x01)  /* interrupt on */
-#define        HPET_IE_OFF     _IO('h', 0x02)  /* interrupt off */
-#define        HPET_INFO       _IOR('h', 0x03, struct hpet_info)
-#define        HPET_EPI        _IO('h', 0x04)  /* enable periodic */
-#define        HPET_DPI        _IO('h', 0x05)  /* disable periodic */
-#define        HPET_IRQFREQ    _IOW('h', 0x6, unsigned long)   /* IRQFREQ usec */
-
-#define MAX_HPET_TBS   8               /* maximum hpet timer blocks */
-
 #endif                         /* !__HPET__ */