diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /arch/x86/kernel/hpet.c | |
| parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
| parent | da40451bba23b51eaca4170a095891646ce72104 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 429d084e014d..235fd6c77504 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
| @@ -368,8 +368,8 @@ static int hpet_clocksource_register(void) | |||
| 368 | return 0; | 368 | return 0; |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | /* | 371 | /** |
| 372 | * Try to setup the HPET timer | 372 | * hpet_enable - Try to setup the HPET timer. Returns 1 on success. |
| 373 | */ | 373 | */ |
| 374 | int __init hpet_enable(void) | 374 | int __init hpet_enable(void) |
| 375 | { | 375 | { |