diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/ide/ide-disk.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 5f49a4ae9dd8..3a2e80237c10 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -985,7 +985,6 @@ static ide_driver_t idedisk_driver = { | |||
| 985 | .do_request = ide_do_rw_disk, | 985 | .do_request = ide_do_rw_disk, |
| 986 | .end_request = ide_end_request, | 986 | .end_request = ide_end_request, |
| 987 | .error = __ide_error, | 987 | .error = __ide_error, |
| 988 | .abort = __ide_abort, | ||
| 989 | #ifdef CONFIG_IDE_PROC_FS | 988 | #ifdef CONFIG_IDE_PROC_FS |
| 990 | .proc = idedisk_proc, | 989 | .proc = idedisk_proc, |
| 991 | #endif | 990 | #endif |