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 /fs | |
| 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 'fs')
| -rw-r--r-- | fs/openpromfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index d88173840082..6b7ff1618945 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
| @@ -131,7 +131,7 @@ static void property_stop(struct seq_file *f, void *v) | |||
| 131 | /* Nothing to do */ | 131 | /* Nothing to do */ |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | static struct seq_operations property_op = { | 134 | static const struct seq_operations property_op = { |
| 135 | .start = property_start, | 135 | .start = property_start, |
| 136 | .next = property_next, | 136 | .next = property_next, |
| 137 | .stop = property_stop, | 137 | .stop = property_stop, |