aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-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)
1076 iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA); 1076 iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA);
1077} 1077}
1078 1078
1079u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl) 1079static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
1080{ 1080{
1081 u32 val = 0; 1081 u32 val = 0;
1082 int i, mi; 1082 int i, mi;