diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hpet.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 6d2626b63a9a..79f63a27bcef 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h | |||
@@ -92,23 +92,14 @@ struct hpet { | |||
92 | * exported interfaces | 92 | * exported interfaces |
93 | */ | 93 | */ |
94 | 94 | ||
95 | struct hpet_task { | ||
96 | void (*ht_func) (void *); | ||
97 | void *ht_data; | ||
98 | void *ht_opaque; | ||
99 | }; | ||
100 | |||
101 | struct hpet_data { | 95 | struct hpet_data { |
102 | unsigned long hd_phys_address; | 96 | unsigned long hd_phys_address; |
103 | void __iomem *hd_address; | 97 | void __iomem *hd_address; |
104 | unsigned short hd_nirqs; | 98 | unsigned short hd_nirqs; |
105 | unsigned short hd_flags; | ||
106 | unsigned int hd_state; /* timer allocated */ | 99 | unsigned int hd_state; /* timer allocated */ |
107 | unsigned int hd_irq[HPET_MAX_TIMERS]; | 100 | unsigned int hd_irq[HPET_MAX_TIMERS]; |
108 | }; | 101 | }; |
109 | 102 | ||
110 | #define HPET_DATA_PLATFORM 0x0001 /* platform call to hpet_alloc */ | ||
111 | |||
112 | static inline void hpet_reserve_timer(struct hpet_data *hd, int timer) | 103 | static inline void hpet_reserve_timer(struct hpet_data *hd, int timer) |
113 | { | 104 | { |
114 | hd->hd_state |= (1 << timer); | 105 | hd->hd_state |= (1 << timer); |
@@ -126,7 +117,7 @@ struct hpet_info { | |||
126 | unsigned short hi_timer; | 117 | unsigned short hi_timer; |
127 | }; | 118 | }; |
128 | 119 | ||
129 | #define HPET_INFO_PERIODIC 0x0001 /* timer is periodic */ | 120 | #define HPET_INFO_PERIODIC 0x0010 /* periodic-capable comparator */ |
130 | 121 | ||
131 | #define HPET_IE_ON _IO('h', 0x01) /* interrupt on */ | 122 | #define HPET_IE_ON _IO('h', 0x01) /* interrupt on */ |
132 | #define HPET_IE_OFF _IO('h', 0x02) /* interrupt off */ | 123 | #define HPET_IE_OFF _IO('h', 0x02) /* interrupt off */ |