From 531cfd64ac6c785df8cc7a7859fe456159fa8537 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 19:27:58 +0800 Subject: [PATCH] --- yaml --- r: 73045 b: refs/heads/master c: 2a52e8d4ea86a9143b4c3a1c1ec249a3b8bee74e h: refs/heads/master i: 73043: c01ce5494c522a5f0d0a07e492d3ce91d60b45fc v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_fsl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 159edec7c18a..c84c6fb336e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9465d5324834f1e99c1343b7bbdc5e6ac8c83f87 +refs/heads/master: 2a52e8d4ea86a9143b4c3a1c1ec249a3b8bee74e diff --git a/trunk/drivers/ata/sata_fsl.c b/trunk/drivers/ata/sata_fsl.c index e04fb75e58fb..e3bf9546fd08 100644 --- a/trunk/drivers/ata/sata_fsl.c +++ b/trunk/drivers/ata/sata_fsl.c @@ -483,7 +483,7 @@ static int sata_fsl_scr_write(struct ata_port *ap, unsigned int sc_reg_in, VPRINTK("xx_scr_write, reg_in = %d\n", sc_reg); - iowrite32(val, (void __iomem *)ssr_base + (sc_reg * 4)); + iowrite32(val, ssr_base + (sc_reg * 4)); return 0; } @@ -507,7 +507,7 @@ static int sata_fsl_scr_read(struct ata_port *ap, unsigned int sc_reg_in, VPRINTK("xx_scr_read, reg_in = %d\n", sc_reg); - *val = ioread32((void __iomem *)ssr_base + (sc_reg * 4)); + *val = ioread32(ssr_base + (sc_reg * 4)); return 0; }