From c2a34c3982f571cfa77e0d8be95083f379faef71 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 29 Jan 2008 00:10:19 +0200
Subject: [PATCH] --- yaml --- r: 82058 b: refs/heads/master c:
 4a537a5518e81dba342eccbffcfa5c27cb5781d4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c78da4f6588e..a1572bce9e5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1fe782414b7122d4c0501d3a0988b7302fa586f
+refs/heads/master: 4a537a5518e81dba342eccbffcfa5c27cb5781d4
diff --git a/trunk/drivers/ata/ata_piix.c b/trunk/drivers/ata/ata_piix.c
index 8e5b9b42b382..47892e6f5ded 100644
--- a/trunk/drivers/ata/ata_piix.c
+++ b/trunk/drivers/ata/ata_piix.c
@@ -1076,7 +1076,7 @@ static void piix_sidpr_write(struct ata_device *dev, unsigned int reg, u32 val)
 	iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA);
 }
 
-u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
+static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
 {
 	u32 val = 0;
 	int i, mi;