diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 21:46:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 21:46:25 -0500 |
| commit | 4784b11c4f49eb88f2dd74df6afc5170f193cedc (patch) | |
| tree | e616eea0139dbd67f56b24b14261a95aa9b35b27 /arch/sparc/kernel | |
| parent | 94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (diff) | |
| parent | 872e2be7c4056496c2871bd9b0f2fae6c374fe47 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Constify function pointer tables.
[SPARC64]: Fix section error in sparcspkr
[SPARC64]: Fix of section mismatch warnings.
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index f8228383895a..d07bc74773aa 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
| @@ -379,7 +379,7 @@ static void c_stop(struct seq_file *m, void *v) | |||
| 379 | { | 379 | { |
| 380 | } | 380 | } |
| 381 | 381 | ||
| 382 | struct seq_operations cpuinfo_op = { | 382 | const struct seq_operations cpuinfo_op = { |
| 383 | .start =c_start, | 383 | .start =c_start, |
| 384 | .next = c_next, | 384 | .next = c_next, |
| 385 | .stop = c_stop, | 385 | .stop = c_stop, |