Rename PORT_CS_RESUME to PORT_CS_PM_RESUME for clarification. --- drivers/scsi/sata_sil24.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 9509aa53e70d4bb8f4d20c54458637970ec15b62 diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index e3d13d6..e38e1fc 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c @@ -138,7 +138,7 @@ enum { PORT_CS_INIT = (1 << 2), /* port initialize */ PORT_CS_IRQ_WOC = (1 << 3), /* interrupt write one to clear */ PORT_CS_CDB16 = (1 << 5), /* 0=12b cdb, 1=16b cdb */ - PORT_CS_RESUME = (1 << 6), /* port resume */ + PORT_CS_PM_RESUME = (1 << 6), /* PM resume */ PORT_CS_32BIT_ACTV = (1 << 10), /* 32-bit activation */ PORT_CS_PM_EN = (1 << 13), /* port multiplier enable */ PORT_CS_RDY = (1 << 31), /* port ready to accept commands */ @@ -1128,7 +1128,7 @@ static int sil24_init_one(struct pci_dev writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_CLR); /* Clear port multiplier enable and resume bits */ - writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR); + writel(PORT_CS_PM_EN | PORT_CS_PM_RESUME, port + PORT_CTRL_CLR); } /* Turn on interrupts */ -- 1.2.4 - : send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html