commit 901720afa30f182c17b088ce4f692249332111bd
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Jan 24 08:12:38 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Jan 24 08:12:38 2008 -0800
tree 964230c44dd07271ab28ac7337d5b3d0bbf257c6
parent 668ebab44c7dd41e6823e6be15d8b28b87ddc0cd
parent de195fd0016f9ab85f1d596dca48dade33f26d36

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:
  [SPARC64]: Partially revert "Constify function pointer tables."

arch/sparc64/solaris/socksys.c

diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index 5f06418..7736411 100644
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -54,7 +54,7 @@
 
 static unsigned int (*sock_poll)(struct file *, poll_table *);
 
-static const struct file_operations socksys_file_ops = {
+static struct file_operations socksys_file_ops = {
 	/* Currently empty */
 };