diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:24:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:24:55 -0500 |
| commit | 74d89c16735d83349ea74232031819e989a49156 (patch) | |
| tree | 1d8ded9c76b6ebe97c3841bbb986aacd63a801e5 /net/socket.c | |
| parent | 52a3220599647ba429fcbca2388ec35b850fa72f (diff) | |
| parent | 05c8e0ac5c37e9739a852b526afeecae97607cbb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 5211ba270375..fcd77eac0ccf 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -539,7 +539,7 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare) | |||
| 539 | return -ENXIO; | 539 | return -ENXIO; |
| 540 | } | 540 | } |
| 541 | 541 | ||
| 542 | struct file_operations bad_sock_fops = { | 542 | const struct file_operations bad_sock_fops = { |
| 543 | .owner = THIS_MODULE, | 543 | .owner = THIS_MODULE, |
| 544 | .open = sock_no_open, | 544 | .open = sock_no_open, |
| 545 | }; | 545 | }; |