From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 28 Jan 2008 22:10:19 +0000 (+0200)
Subject: ata_piix.c: make piix_merge_scr() static
X-Git-Tag: v2.6.25-rc1~1079^2~6
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4a537a5518e81dba342eccbffcfa5c27cb5781d4

ata_piix.c: make piix_merge_scr() static

piix_merge_scr() can become static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 8e5b9b42b382..47892e6f5ded 100644
--- a/drivers/ata/ata_piix.c
+++ b/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;