diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 11:12:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-24 11:12:38 -0500 |
| commit | 901720afa30f182c17b088ce4f692249332111bd (patch) | |
| tree | 964230c44dd07271ab28ac7337d5b3d0bbf257c6 /arch | |
| parent | 668ebab44c7dd41e6823e6be15d8b28b87ddc0cd (diff) | |
| parent | de195fd0016f9ab85f1d596dca48dade33f26d36 (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."
Diffstat (limited to 'arch')
| -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 *); | |||
| 54 | 54 | ||
| 55 | static unsigned int (*sock_poll)(struct file *, poll_table *); | 55 | static unsigned int (*sock_poll)(struct file *, poll_table *); |
| 56 | 56 | ||
| 57 | static const struct file_operations socksys_file_ops = { | 57 | static struct file_operations socksys_file_ops = { |
| 58 | /* Currently empty */ | 58 | /* Currently empty */ |
| 59 | }; | 59 | }; |
| 60 | 60 | ||