linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 707f7cb..2723819 100644 (file)
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -3,8 +3,6 @@
 
 #include <linux/compiler.h>
 
-#ifdef __KERNEL__
-
 /*
  * Offsets into HPET Registers
  */
@@ -87,6 +85,22 @@ struct hpet {
 #define        Tn_FSB_INT_ADDR_SHIFT           (32UL)
 #define        Tn_FSB_INT_VAL_MASK             (0x00000000ffffffffULL)
 
+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      0x0001  /* timer is periodic */
+
+#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 */
+
 /*
  * exported interfaces
  */
@@ -119,22 +133,4 @@ 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__ */
-
-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      0x0001  /* timer is periodic */
-
-#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 */
-
 #endif                         /* !__HPET__ */