diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 05:46:25 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 05:46:25 +0300 |
commit | 4784b11c4f49eb88f2dd74df6afc5170f193cedc (patch) | |
tree | e616eea0139dbd67f56b24b14261a95aa9b35b27 /arch/sparc64/solaris | |
parent | 94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (diff) | |
parent | 872e2be7c4056496c2871bd9b0f2fae6c374fe47 (diff) | |
download | linux-4784b11c4f49eb88f2dd74df6afc5170f193cedc.tar.xz |
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/sparc64/solaris')
-rw-r--r-- | arch/sparc64/solaris/socksys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c index 7736411f244f..5f064183c874 100644 --- a/arch/sparc64/solaris/socksys.c +++ b/arch/sparc64/solaris/socksys.c @@ -54,7 +54,7 @@ extern void mykfree(void *); static unsigned int (*sock_poll)(struct file *, poll_table *); -static struct file_operations socksys_file_ops = { +static const struct file_operations socksys_file_ops = { /* Currently empty */ }; |