diff options
| author | Robert Picco <robert.picco@hp.com> | 2004-06-26 20:56:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 20:56:49 -0700 |
| commit | ed51aeb3c8f2525743b127328f74bb011fd06f62 (patch) | |
| tree | d87ff843b65605008997782646f89688a2319ed5 /include | |
| parent | 30c07cae6d0a80f6d8697df1107a82bdbab58084 (diff) | |
[PATCH] hpet fixes
I eliminated the request_irq brain damage, chopped off procfs support
(didn't care for it too much in the first place and it was adopted from
rtc.c), made the check for FMODE_WRITE in hpet_open and responded to a few
other suggestions.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hpet.h | 2 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 9ab04e9887dc..6b7fb6208f8c 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h @@ -115,6 +115,8 @@ struct hpet_task { void *ht_opaque; }; +#define HD_STATE(HD, TIMER) (HD)->hd_state |= (1 << TIMER) + struct hpet_data { unsigned long hd_address; unsigned short hd_nirqs; diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 647bed4bb6f5..f62586335e48 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -33,9 +33,9 @@ #define SGI_STREAMS_KEYBOARD 150 /* drivers/sgi/char/usema.c */ #define SGI_USEMACLONE 151 -#define HPET_MINOR 152 #define TUN_MINOR 200 +#define HPET_MINOR 228 struct device; |