diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /drivers/ide/ppc/pmac.c | |
parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 569f16767442..818380b5fd27 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1324,9 +1324,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1324 | /* XXX FIXME: Media bay stuff need re-organizing */ | 1324 | /* XXX FIXME: Media bay stuff need re-organizing */ |
1325 | if (np->parent && np->parent->name | 1325 | if (np->parent && np->parent->name |
1326 | && strcasecmp(np->parent->name, "media-bay") == 0) { | 1326 | && strcasecmp(np->parent->name, "media-bay") == 0) { |
1327 | #ifdef CONFIG_PMAC_PBOOK | 1327 | #ifdef CONFIG_PMAC_MEDIABAY |
1328 | media_bay_set_ide_infos(np->parent, pmif->regbase, pmif->irq, hwif->index); | 1328 | media_bay_set_ide_infos(np->parent, pmif->regbase, pmif->irq, hwif->index); |
1329 | #endif /* CONFIG_PMAC_PBOOK */ | 1329 | #endif /* CONFIG_PMAC_MEDIABAY */ |
1330 | pmif->mediabay = 1; | 1330 | pmif->mediabay = 1; |
1331 | if (!bidp) | 1331 | if (!bidp) |
1332 | pmif->aapl_bus_id = 1; | 1332 | pmif->aapl_bus_id = 1; |
@@ -1382,10 +1382,10 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1382 | hwif->index, model_name[pmif->kind], pmif->aapl_bus_id, | 1382 | hwif->index, model_name[pmif->kind], pmif->aapl_bus_id, |
1383 | pmif->mediabay ? " (mediabay)" : "", hwif->irq); | 1383 | pmif->mediabay ? " (mediabay)" : "", hwif->irq); |
1384 | 1384 | ||
1385 | #ifdef CONFIG_PMAC_PBOOK | 1385 | #ifdef CONFIG_PMAC_MEDIABAY |
1386 | if (pmif->mediabay && check_media_bay_by_base(pmif->regbase, MB_CD) == 0) | 1386 | if (pmif->mediabay && check_media_bay_by_base(pmif->regbase, MB_CD) == 0) |
1387 | hwif->noprobe = 0; | 1387 | hwif->noprobe = 0; |
1388 | #endif /* CONFIG_PMAC_PBOOK */ | 1388 | #endif /* CONFIG_PMAC_MEDIABAY */ |
1389 | 1389 | ||
1390 | hwif->sg_max_nents = MAX_DCMDS; | 1390 | hwif->sg_max_nents = MAX_DCMDS; |
1391 | 1391 | ||