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:
  ide-cd: fix missing residual count setting in DMA mode
  ht6560b: force prefetch for some devices
  ht6560b can only do up to PIO mode 4
  linux/hdsmart.h: fix goofups (take 2)
  via82cxxx: add new PCI id for cx700
  falconide: locking bugfix
  MAINTAINERS: update ide-cd maintainer's email address
  ide/libata: ST310211A has buggy HPA too
  ide: Add missing base addresses for falconide and macide

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 709b9e4d2871..9ebec08eefd9 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -17,9 +17,6 @@ static int __init ide_generic_init(void)
         u8 idx[MAX_HWIFS];
         int i;
 
-        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-                ide_get_lock(NULL, NULL); /* for atari only */
-
         for (i = 0; i < MAX_HWIFS; i++) {
                 ide_hwif_t *hwif = &ide_hwifs[i];
 
@@ -31,9 +28,6 @@ static int __init ide_generic_init(void)
 
         ide_device_add_all(idx, NULL);
 
-        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-                ide_release_lock();     /* for atari only */
-
         return 0;
 }