diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:29:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:29:02 -0500 |
commit | 874ff01bd9183ad16495acfd54e93a619d12b8b5 (patch) | |
tree | e9527e94649fadfa705dae64018e027e51681b88 /arch/x86_64/kernel/time.c | |
parent | ebbe46f73a11a667df59cb8e58b371c0a35f29d0 (diff) | |
parent | 86aae08faa0069a559ba543ff3dab33fe95f891b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
Documentation/kernel-docs.txt update.
arch/cris: typo in KERN_INFO
Storage class should be before const qualifier
kernel/printk.c: comment fix
update I/O sched Kconfig help texts - CFQ is now default, not AS.
Remove duplicate listing of Cris arch from README
kbuild: more doc. cleanups
doc: make doc. for maxcpus= more visible
drivers/net/eexpress.c: remove duplicate comment
add a help text for BLK_DEV_GENERIC
correct a dead URL in the IP_MULTICAST help text
fix the BAYCOM_SER_HDX help text
fix SCSI_SCAN_ASYNC help text
trivial documentation patch for platform.txt
Fix typos concerning hierarchy
Fix comment typo "spin_lock_irqrestore".
Fix misspellings of "agressive".
drivers/scsi/a100u2w.c: trivial typo patch
Correct trivial typo in log2.h.
Remove useless FIND_FIRST_BIT() macro from cardbus.c.
...
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index a87c51705620..c9addcfb96dc 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -418,7 +418,7 @@ static struct sysdev_class timer_sysclass = { | |||
418 | set_kset_name("timer"), | 418 | set_kset_name("timer"), |
419 | }; | 419 | }; |
420 | 420 | ||
421 | /* XXX this driverfs stuff should probably go elsewhere later -john */ | 421 | /* XXX this sysfs stuff should probably go elsewhere later -john */ |
422 | static struct sys_device device_timer = { | 422 | static struct sys_device device_timer = { |
423 | .id = 0, | 423 | .id = 0, |
424 | .cls = &timer_sysclass, | 424 | .cls = &timer_sysclass, |