vserver 1.9.3

[linux-2.6.git] / drivers / ide / pci / amd74xx.c

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 30bdcb3..3967254 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -416,6 +416,9 @@ static void __init init_hwif_amd74xx(ide_hwif_t *hwif)
 {
        int i;
 
+       if (!hwif->irq)
+               hwif->irq = hwif->channel ? 15 : 14;
+
        hwif->autodma = 0;
 
        hwif->tuneproc = &amd74xx_tune_drive;
@@ -520,7 +523,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
 
 static struct pci_driver driver = {
-       .name           = "AMD IDE",
+       .name           = "AMD_IDE",
        .id_table       = amd74xx_pci_tbl,
        .probe          = amd74xx_probe,
 };