From 1bcb424b3ea0a565f5801c1ab83ada809e6678a7 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 17:36:38 +0200
Subject: [PATCH] --- yaml --- r: 93565 b: refs/heads/master c:
 cb5528ab19ece76be5299b33746ca7d58c187a26 h: refs/heads/master i:   93563:
 1e8f66361617e11de301887b106c0986cc4b1403 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/ide/legacy/falconide.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d1676e962620..9f2f3f34e9cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54c05395273678fe23e9169a435fdc15ee17535e
+refs/heads/master: cb5528ab19ece76be5299b33746ca7d58c187a26
diff --git a/trunk/drivers/ide/legacy/falconide.c b/trunk/drivers/ide/legacy/falconide.c
index b88a3c192d84..8c9c9f7f54ca 100644
--- a/trunk/drivers/ide/legacy/falconide.c
+++ b/trunk/drivers/ide/legacy/falconide.c
@@ -22,6 +22,7 @@
 #include <asm/atariints.h>
 #include <asm/atari_stdma.h>
 
+#define DRV_NAME "falconide"
 
     /*
      *  Base of the IDE interface
@@ -74,6 +75,11 @@ static int __init falconide_init(void)
 
 	printk(KERN_INFO "ide: Falcon IDE controller\n");
 
+	if (!request_mem_region(ATA_HD_BASE, 0x40, DRV_NAME)) {
+		printk(KERN_ERR "%s: resources busy\n", DRV_NAME);
+		return -EBUSY;
+	}
+
 	falconide_setup_ports(&hw);
 
 	hwif = ide_find_port();
@@ -83,6 +89,7 @@ static int __init falconide_init(void)
 
 		ide_init_port_data(hwif, index);
 		ide_init_port_hw(hwif, &hw);
+		hwif->mmio = 1;
 
 		ide_get_lock(NULL, NULL);
 		ide_device_add(idx, NULL);