summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-01-29 01:10:19 +0300
committerJeff Garzik <jeff@garzik.org>2008-02-01 20:26:39 +0300
commit4a537a5518e81dba342eccbffcfa5c27cb5781d4 (patch)
tree55dad9a1b05b5212de153aaab3dc7875235d7e9a /drivers/ata
parenta1fe782414b7122d4c0501d3a0988b7302fa586f (diff)
downloadlinux-4a537a5518e81dba342eccbffcfa5c27cb5781d4.tar.xz
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ata_piix.c2
1 files changed, 1 insertions, 1 deletions
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;