From 18e80fc383380df2fb97663310ac314de896b1e6 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 6 Jan 2008 10:05:28 +0900
Subject: [PATCH] --- yaml --- r: 75359 b: refs/heads/master c:
 af183748044cefb1050ab47519e6bdcfcecec226 h: refs/heads/master i:   75357:
 c0264666ced90e3d6774e3b42687bc5ec3dee58c   75355:
 9c110095343bdff716bd0ea7ef349b06c613a08d   75351:
 adba743c3286f8c8d9fd423a66bc64b5fc8285be   75343:
 102619d9562b3de2df990f79124c029f839d24d6   75327:
 759a1ace1423c0e62d2cc6072e567e7b5f108d54 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/ata/pata_ixp4xx_cf.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 57eaec814f05..9a34795419ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36906d9beab941452cad406cc03f05cc78671256
+refs/heads/master: af183748044cefb1050ab47519e6bdcfcecec226
diff --git a/trunk/drivers/ata/pata_ixp4xx_cf.c b/trunk/drivers/ata/pata_ixp4xx_cf.c
index fcd532afbf2e..120b5bfa7ce6 100644
--- a/trunk/drivers/ata/pata_ixp4xx_cf.c
+++ b/trunk/drivers/ata/pata_ixp4xx_cf.c
@@ -130,10 +130,11 @@ static struct ata_port_operations ixp4xx_port_ops = {
 	.port_start		= ata_port_start,
 };
 
-static void ixp4xx_setup_port(struct ata_ioports *ioaddr,
+static void ixp4xx_setup_port(struct ata_port *ap,
 			      struct ixp4xx_pata_data *data,
 			      unsigned long raw_cs0, unsigned long raw_cs1)
 {
+	struct ata_ioports *ioaddr = &ap->ioaddr;
 	unsigned long raw_cmd = raw_cs0;
 	unsigned long raw_ctl = raw_cs1 + 0x06;