diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:25:57 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:25:57 -0400 |
| commit | 50cb993ea6cd187bfed085cb3e0747066edeb02f (patch) | |
| tree | 61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /drivers/char/hpet.c | |
| parent | 445c2714cf72817ab1ad3ca894c6d9b2047b3a3e (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index fb0a85a1eb36..b3f5dbc6d880 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -623,6 +623,7 @@ static inline int hpet_tpcheck(struct hpet_task *tp) | |||
| 623 | return -ENXIO; | 623 | return -ENXIO; |
| 624 | } | 624 | } |
| 625 | 625 | ||
| 626 | #if 0 | ||
| 626 | int hpet_unregister(struct hpet_task *tp) | 627 | int hpet_unregister(struct hpet_task *tp) |
| 627 | { | 628 | { |
| 628 | struct hpet_dev *devp; | 629 | struct hpet_dev *devp; |
| @@ -652,6 +653,7 @@ int hpet_unregister(struct hpet_task *tp) | |||
| 652 | 653 | ||
| 653 | return 0; | 654 | return 0; |
| 654 | } | 655 | } |
| 656 | #endif /* 0 */ | ||
| 655 | 657 | ||
| 656 | static ctl_table hpet_table[] = { | 658 | static ctl_table hpet_table[] = { |
| 657 | { | 659 | { |