diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /include/linux/poll.h | |
| parent | eae61f3c829439f8f9121b5cd48a14be04df451f (diff) | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to 'include/linux/poll.h')
| -rw-r--r-- | include/linux/poll.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/poll.h b/include/linux/poll.h index 56e76af78102..1a2ccd6f3823 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h | |||
| @@ -57,7 +57,7 @@ struct poll_table_entry { | |||
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * Structures and helpers for sys_poll/sys_poll | 60 | * Structures and helpers for select/poll syscall |
| 61 | */ | 61 | */ |
| 62 | struct poll_wqueues { | 62 | struct poll_wqueues { |
| 63 | poll_table pt; | 63 | poll_table pt; |