diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:10:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:10:10 +1000 |
| commit | 9546e899e803ea8e738911b36bfcfe020031eefe (patch) | |
| tree | 694cad513863d6b868b920feb51f7240bddda776 /include | |
| parent | afbc250aec569e4423e43eb3f3281949519de203 (diff) | |
| parent | abde5fb636b15eea47730167fb587515a23d1c50 (diff) | |
Merge commit 'timers/auto-timers-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hpet.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 2dc29ce6c8e4..6d2626b63a9a 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h @@ -37,6 +37,7 @@ struct hpet { #define hpet_compare _u1._hpet_compare #define HPET_MAX_TIMERS (32) +#define HPET_MAX_IRQ (32) /* * HPET general capabilities register @@ -64,7 +65,7 @@ struct hpet { */ #define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL) -#define Tn_INI_ROUTE_CAP_SHIFT (32UL) +#define Tn_INT_ROUTE_CAP_SHIFT (32UL) #define Tn_FSB_INT_DELCAP_MASK (0x8000UL) #define Tn_FSB_INT_DELCAP_SHIFT (15) #define Tn_FSB_EN_CNF_MASK (0x4000UL) |