diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 08:12:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 08:12:38 -0800 |
| commit | 901720afa30f182c17b088ce4f692249332111bd (patch) | |
| tree | 964230c44dd07271ab28ac7337d5b3d0bbf257c6 | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff) | |
| parent | [SPARC64]: Partially revert "Constify function pointer tables." (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:
[SPARC64]: Partially revert "Constify function pointer tables."
| -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 5f064183c874..7736411f244f 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 const struct file_operations socksys_file_ops = { +static struct file_operations socksys_file_ops = { /* Currently empty */ }; |