From f451fc3d446ad90fb81b0de9644cb59915edeb7d Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 23 Jul 2008 19:55:56 +0200
Subject: [PATCH] --- yaml --- r: 105017 b: refs/heads/master c:
 d6276b5f5cc7508124de291f3ed59c6945c17ae7 h: refs/heads/master i:   105015:
 51edc421efec71e3e57438a0c3aac221f804b494 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/ide-probe.c | 4 +---
 trunk/drivers/ide/ide.c       | 1 +
 trunk/include/linux/ide.h     | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 357a9affe26f..54b7d40acc3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc74b247bedb3a1f80eb6371d4171f2d49c1c77
+refs/heads/master: d6276b5f5cc7508124de291f3ed59c6945c17ae7
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 21cea45e9f21..3cc8ade2cc4f 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -1689,14 +1689,12 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t **hws, hw_regs_t *hw,
 	ide_std_init_ports(hw, base, ctl);
 	hw->irq = irq;
 	hw->chipset = d->chipset;
+	hw->config = config;
 
 	hwif = ide_find_port_slot(d);
 	if (hwif) {
 		hwif->chipset = hw->chipset;
 
-		if (config)
-			hwif->config_data = config;
-
 		hws[port_no] = hw;
 		idx[port_no] = hwif->index;
 	}
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
index 434dd02a4bdc..961f31c648c9 100644
--- a/trunk/drivers/ide/ide.c
+++ b/trunk/drivers/ide/ide.c
@@ -286,6 +286,7 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
 	hwif->dev = hw->dev;
 	hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
 	hwif->ack_intr = hw->ack_intr;
+	hwif->config_data = hw->config;
 }
 
 /*
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 260e871ae880..e340218b2a5f 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -178,6 +178,7 @@ typedef struct hw_regs_s {
 	ide_ack_intr_t	*ack_intr;		/* acknowledge interrupt */
 	hwif_chipset_t  chipset;
 	struct device	*dev, *parent;
+	unsigned long	config;
 } hw_regs_t;
 
 void ide_init_port_data(struct hwif_s *, unsigned int);