summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-23 18:46:25 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-23 18:46:25 -0800
commit4784b11c4f49eb88f2dd74df6afc5170f193cedc (patch)
treee616eea0139dbd67f56b24b14261a95aa9b35b27 /fs
parent94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (diff)
parent872e2be7c4056496c2871bd9b0f2fae6c374fe47 (diff)
downloadlinux-4784b11c4f49eb88f2dd74df6afc5170f193cedc.tar.gz
linux-4784b11c4f49eb88f2dd74df6afc5170f193cedc.tar.bz2
linux-4784b11c4f49eb88f2dd74df6afc5170f193cedc.zip
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.c2
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)
/* Nothing to do */
}
-static struct seq_operations property_op = {
+static const struct seq_operations property_op = {
.start = property_start,
.next = property_next,
.stop = property_stop,