diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
| commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
| tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /drivers/ide/ide-disk.c | |
| parent | 1b82c9666a6f637ccb3a86d0fbe23d0427076815 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | talos-op-linux-48ae74443403ab25876959e84785f61bf421ccef.tar.gz talos-op-linux-48ae74443403ab25876959e84785f61bf421ccef.zip | |
Merge branch 'linus' into x86/step
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 = { .do_request = ide_do_rw_disk, .end_request = ide_end_request, .error = __ide_error, - .abort = __ide_abort, #ifdef CONFIG_IDE_PROC_FS .proc = idedisk_proc, #endif |
