diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 11:59:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 11:59:39 -0500 |
| commit | f3c1e66f79f6a19951da10035c46faccc536ad59 (patch) | |
| tree | 52bb523563f844233b00476deae98c973e79cbde | |
| parent | 8ae47c1e7deda7fa959a1dd272ff67e8a1830490 (diff) | |
| parent | 30a7caabbb8e8702b9cf453fee83f773d8b3430d (diff) | |
Merge branch 'for-2.6.38/event-handling' into for-next
| -rw-r--r-- | drivers/cdrom/cdrom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 1ea8f8d363c6..14033a36bcd0 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -1429,6 +1429,7 @@ unsigned int cdrom_check_events(struct cdrom_device_info *cdi, | |||
| 1429 | cdi->vfs_events = 0; | 1429 | cdi->vfs_events = 0; |
| 1430 | return events; | 1430 | return events; |
| 1431 | } | 1431 | } |
| 1432 | EXPORT_SYMBOL(cdrom_check_events); | ||
| 1432 | 1433 | ||
| 1433 | /* We want to make media_changed accessible to the user through an | 1434 | /* We want to make media_changed accessible to the user through an |
| 1434 | * ioctl. The main problem now is that we must double-buffer the | 1435 | * ioctl. The main problem now is that we must double-buffer the |