diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /net/socket.c | |
| parent | 600511e86babe3727264a0883a3a264f6fb6caf5 (diff) | |
| parent | f3cab8a0b1a772dc8b055b7affa567a366627c9e (diff) | |
Merge branch 'master'
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 | }; |