iwlagn: do not send key clear commands when rfkill enabled

[safe/jmp/linux-2.6] / drivers / ide / scc_pata.c

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 9415f8c..1104bb3 100644 (file)
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -559,7 +559,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
 {
        struct scc_ports *ports = pci_get_drvdata(dev);
        struct ide_host *host;
-       hw_regs_t hw, *hws[] = { &hw };
+       struct ide_hw hw, *hws[] = { &hw };
        int i, rc;
 
        memset(&hw, 0, sizeof(hw));