From 0995e5a332c6b17d2f30b8fbf65b4273cddb369f Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 10 Jul 2007 21:36:13 -0400
Subject: [PATCH] --- yaml --- r: 59079 b: refs/heads/master c:
 790956e7bbf0a7b73e72b04d3bd63d974c7e29bb h: refs/heads/master i:   59077:
 baf0edceb8e257cb20a996a931e0426f715e54e0   59075:
 2183dd50e27df88aef124422ed27ebc84849b393   59071:
 13ccb5a1a05193825fb3dbf4d87f2f56b1efa67e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/pata_hpt3x3.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ada81fe63249..174b2d313bf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f8d90ab797682ab51b27748b960aec8aa42892f
+refs/heads/master: 790956e7bbf0a7b73e72b04d3bd63d974c7e29bb
diff --git a/trunk/drivers/ata/pata_hpt3x3.c b/trunk/drivers/ata/pata_hpt3x3.c
index a66e2c3a221b..be0f05efac6d 100644
--- a/trunk/drivers/ata/pata_hpt3x3.c
+++ b/trunk/drivers/ata/pata_hpt3x3.c
@@ -52,6 +52,7 @@ static void hpt3x3_set_piomode(struct ata_port *ap, struct ata_device *adev)
 	pci_write_config_dword(pdev, 0x48, r2);
 }
 
+#if defined(CONFIG_PATA_HPT3X3_DMA)
 /**
  *	hpt3x3_set_dmamode		-	DMA timing setup
  *	@ap: ATA interface
@@ -86,6 +87,7 @@ static void hpt3x3_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 	pci_write_config_dword(pdev, 0x44, r1);
 	pci_write_config_dword(pdev, 0x48, r2);
 }
+#endif /* CONFIG_PATA_HPT3X3_DMA */
 
 /**
  *	hpt3x3_atapi_dma	-	ATAPI DMA check
@@ -120,6 +122,9 @@ static struct scsi_host_template hpt3x3_sht = {
 static struct ata_port_operations hpt3x3_port_ops = {
 	.port_disable	= ata_port_disable,
 	.set_piomode	= hpt3x3_set_piomode,
+#if defined(CONFIG_PATA_HPT3X3_DMA)
+	.set_dmamode	= hpt3x3_set_dmamode,
+#endif
 	.mode_filter	= ata_pci_default_filter,
 
 	.tf_load	= ata_tf_load,