diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 13:50:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 13:50:56 -0400 |
| commit | 91e8549bde9e5cc88c5a2e8c8114389279e240b5 (patch) | |
| tree | 5d5432c2a8a066ecf92e0eec9f07e8b96a6be198 /drivers/ide/ide-cd.c | |
| parent | 37fc67c9f0454f7a6448d87225cfee8067fd731d (diff) | |
| parent | 7eec77a1816a7042591a6cbdb4820e9e7ebffe0e (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd
block: don't propagate unlisted DISK_EVENTs to userland
elevator: check for ELEVATOR_INSERT_SORT_MERGE in !elvpriv case too
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index fd1e11799137..a5ec5a7cb381 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1782,7 +1782,6 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
| 1782 | ide_cd_read_toc(drive, &sense); | 1782 | ide_cd_read_toc(drive, &sense); |
| 1783 | g->fops = &idecd_ops; | 1783 | g->fops = &idecd_ops; |
| 1784 | g->flags |= GENHD_FL_REMOVABLE; | 1784 | g->flags |= GENHD_FL_REMOVABLE; |
| 1785 | g->events = DISK_EVENT_MEDIA_CHANGE; | ||
| 1786 | add_disk(g); | 1785 | add_disk(g); |
| 1787 | return 0; | 1786 | return 0; |
| 1788 | 1787 | ||