diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 17:18:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 17:18:15 -0500 |
| commit | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (patch) | |
| tree | d4734ba408aba217d8dc44cd6a2741a40c62b407 /arch/ia64/kernel/setup.c | |
| parent | 6e2324e0fbb3a075382359b1cbc392a3f4ec8792 (diff) | |
| parent | 38c0b2c2aaab5595a140ade4410e01d407fff751 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 088e5dded8dc..c33305d8e5eb 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -518,7 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v) | |||
| 518 | char family[32], features[128], *cp, sep; | 518 | char family[32], features[128], *cp, sep; |
| 519 | struct cpuinfo_ia64 *c = v; | 519 | struct cpuinfo_ia64 *c = v; |
| 520 | unsigned long mask; | 520 | unsigned long mask; |
| 521 | unsigned int proc_freq; | 521 | unsigned long proc_freq; |
| 522 | int i; | 522 | int i; |
| 523 | 523 | ||
| 524 | mask = c->features; | 524 | mask = c->features; |