diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /net/atm/proc.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'net/atm/proc.c')
| -rw-r--r-- | net/atm/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/proc.c b/net/atm/proc.c index 6262aeae398e..f85da0779e5e 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c | |||
| @@ -38,6 +38,7 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf, | |||
| 38 | static const struct file_operations proc_atm_dev_ops = { | 38 | static const struct file_operations proc_atm_dev_ops = { |
| 39 | .owner = THIS_MODULE, | 39 | .owner = THIS_MODULE, |
| 40 | .read = proc_dev_atm_read, | 40 | .read = proc_dev_atm_read, |
| 41 | .llseek = noop_llseek, | ||
| 41 | }; | 42 | }; |
| 42 | 43 | ||
| 43 | static void add_stats(struct seq_file *seq, const char *aal, | 44 | static void add_stats(struct seq_file *seq, const char *aal, |