diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 07:52:47 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 07:52:47 +0200 |
commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/ata/sata_svw.c | |
parent | [libata] Delete pata_it8172 driver (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
download | linux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.tar.xz linux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/sata_svw.c')
-rw-r--r-- | drivers/ata/sata_svw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 2a7e3495cf16..d6d6658d8328 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c @@ -268,7 +268,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, /* Match it to a port node */ index = (ap == ap->host->ports[0]) ? 0 : 1; for (np = np->child; np != NULL; np = np->sibling) { - u32 *reg = (u32 *)get_property(np, "reg", NULL); + const u32 *reg = get_property(np, "reg", NULL); if (!reg) continue; if (index == *reg) |