diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 17:58:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 17:58:02 -0500 |
| commit | f3191248bf1bf6627c04c5624904df45e0a979ed (patch) | |
| tree | ad7a49bf947f849740999702204373c3c12caea7 /drivers/ide/ide-disk.c | |
| parent | cbb51afa6d69be003cc827a89e023906885f241e (diff) | |
| parent | a14dc57495899175a0827673fe23ed17b5653896 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (100 commits)
ide: move hwif_register() call out of ide_probe_port()
ide: factor out code for tuning devices from ide_probe_port()
ide: move handling of I/O resources out of ide_probe_port()
ide: make probe_hwif() return an error value
ide: use ide_remove_port_from_hwgroup in init_irq()
ide: prepare init_irq() for using ide_remove_port_from_hwgroup()
ide: factor out code removing port from hwgroup from ide_unregister()
ide: I/O resources are released too early in ide_unregister()
ide: cleanup ide_system_bus_speed()
ide: remove needless zeroing of hwgroup fields from init_irq()
ide: remove unused ide_hwgroup_t fields
ide_platform: remove struct hwif_prop
ide: remove hwif->present manipulations from hwif_init()
ide: move wait_hwif_ready() documentation in the right place
ide: fix handling of busy I/O resources in probe_hwif()
<linux/hdsmart.h> is not used by kernel code
ide: don't include <linux/hdsmart.h>
ide-floppy: cleanup header
ide: update/add my Copyrights
ide: delete filenames/versions from comments
...
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 717e114ced52..3c69822507e2 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -1,10 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/drivers/ide/ide-disk.c Version 1.18 Mar 05, 2003 | 2 | * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) |
| 3 | * | 3 | * Copyright (C) 1998-2002 Linux ATA Development |
| 4 | * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) | 4 | * Andre Hedrick <andre@linux-ide.org> |
| 5 | * Copyright (C) 1998-2002 Linux ATA Development | 5 | * Copyright (C) 2003 Red Hat <alan@redhat.com> |
| 6 | * Andre Hedrick <andre@linux-ide.org> | 6 | * Copyright (C) 2003-2005, 2007 Bartlomiej Zolnierkiewicz |
| 7 | * Copyright (C) 2003 Red Hat <alan@redhat.com> | ||
| 8 | */ | 7 | */ |
| 9 | 8 | ||
| 10 | /* | 9 | /* |