From 2b8a1429cac0b65bd8a7bc07f2baadce07ca587e Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 10 May 2010 21:41:27 +0200
Subject: [PATCH] --- yaml --- r: 192615 b: refs/heads/master c:
 1b959c412bbf38ce0fa658183f72027ca8331ee3 h: refs/heads/master i:   192613:
 c567b32a10b42757e0ae6bd0e1d2a7d28df39e2f   192611:
 cf4df9d7bff12ad6e88633af345bb4689894d804   192607:
 5591e9b404a9b11bd962c8a6fac6ec5087327c20 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_mv.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a0d424995a0..d402a2a3eae6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f79146041853abf551c3d70d05c2e08e1e9c255
+refs/heads/master: 1b959c412bbf38ce0fa658183f72027ca8331ee3
diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c
index 71cc0d42f9e1..bd486462951c 100644
--- a/trunk/drivers/ata/sata_mv.c
+++ b/trunk/drivers/ata/sata_mv.c
@@ -3656,9 +3656,6 @@ static void mv_port_init(struct ata_ioports *port,  void __iomem *port_mmio)
 	/* special case: control/altstatus doesn't have ATA_REG_ address */
 	port->altstatus_addr = port->ctl_addr = shd_base + SHD_CTL_AST;
 
-	/* unused: */
-	port->cmd_addr = port->bmdma_addr = port->scr_addr = NULL;
-
 	/* Clear any currently outstanding port interrupt conditions */
 	serr = port_mmio + mv_scr_offset(SCR_ERROR);
 	writelfl(readl(serr), serr);