* [PATCH] pata_sil680: compile fix
@ 2007-05-19 10:29 Tejun Heo
2007-05-19 20:57 ` Benjamin Herrenschmidt
2007-05-22 0:02 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Tejun Heo @ 2007-05-19 10:29 UTC (permalink / raw)
To: Jeff Garzik, IDE/ATA development list, Benjamin Herrenschmidt
Recent mmio change broke compilation if PM is turned on. Fix it.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
pata_sil680.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 557a37b..89f59d1 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -431,7 +431,9 @@ use_ioports:
#ifdef CONFIG_PM
static int sil680_reinit_one(struct pci_dev *pdev)
{
- sil680_init_chip(pdev);
+ int try_mmio;
+
+ sil680_init_chip(pdev, &try_mmio);
return ata_pci_device_resume(pdev);
}
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] pata_sil680: compile fix
2007-05-19 10:29 [PATCH] pata_sil680: compile fix Tejun Heo
@ 2007-05-19 20:57 ` Benjamin Herrenschmidt
2007-05-22 0:02 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2007-05-19 20:57 UTC (permalink / raw)
To: Tejun Heo; +Cc: Jeff Garzik, IDE/ATA development list
On Sat, 2007-05-19 at 12:29 +0200, Tejun Heo wrote:
> Recent mmio change broke compilation if PM is turned on. Fix it.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Oops.. sorry about that.
Cheers,
Ben.
> ---
> pata_sil680.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
> index 557a37b..89f59d1 100644
> --- a/drivers/ata/pata_sil680.c
> +++ b/drivers/ata/pata_sil680.c
> @@ -431,7 +431,9 @@ use_ioports:
> #ifdef CONFIG_PM
> static int sil680_reinit_one(struct pci_dev *pdev)
> {
> - sil680_init_chip(pdev);
> + int try_mmio;
> +
> + sil680_init_chip(pdev, &try_mmio);
> return ata_pci_device_resume(pdev);
> }
> #endif
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pata_sil680: compile fix
2007-05-19 10:29 [PATCH] pata_sil680: compile fix Tejun Heo
2007-05-19 20:57 ` Benjamin Herrenschmidt
@ 2007-05-22 0:02 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2007-05-22 0:02 UTC (permalink / raw)
To: Tejun Heo; +Cc: IDE/ATA development list, Benjamin Herrenschmidt
Tejun Heo wrote:
> Recent mmio change broke compilation if PM is turned on. Fix it.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> pata_sil680.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-05-22 0:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-19 10:29 [PATCH] pata_sil680: compile fix Tejun Heo
2007-05-19 20:57 ` Benjamin Herrenschmidt
2007-05-22 0:02 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).