From 2c7a545128204130afa7fbfac8e8b431b73d68b5 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 25 Jul 2012 16:07:40 -0400
Subject: [PATCH] --- yaml --- r: 316851 b: refs/heads/master c:
 641589bff714f39b33ef1d7f02eaa009f2993b64 h: refs/heads/master i:   316849:
 9916d7234c6f8cc243f5c15c9830535d2e958756   316847:
 efad39f350e721c5080c4dbde71cdc3031d4251c v: v3

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

diff --git a/[refs] b/[refs]
index 26481602ed71..a51d933b921c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354b2eac3848bddbcb111079138b907ccca70ae8
+refs/heads/master: 641589bff714f39b33ef1d7f02eaa009f2993b64
diff --git a/trunk/drivers/ata/pata_cmd64x.c b/trunk/drivers/ata/pata_cmd64x.c
index 8ec25af898de..7ba01415b676 100644
--- a/trunk/drivers/ata/pata_cmd64x.c
+++ b/trunk/drivers/ata/pata_cmd64x.c
@@ -423,7 +423,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 			.port_ops = &cmd648_port_ops
 		}
 	};
-	const struct ata_port_info *ppi[] = { 
+	const struct ata_port_info *ppi[] = {
 		&cmd_info[id->driver_data],
 		&cmd_info[id->driver_data],
 		NULL
@@ -478,7 +478,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) {
 		dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n");
 		ppi[0] = &ata_dummy_port_info;
-		
+
 	}
 	if (port_ok && !(reg & CNTRL_CH1)) {
 		dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n");