diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
| commit | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (patch) | |
| tree | d6cec15baa1ddfee108ef77b315dfdea5e3fa71c /drivers | |
| parent | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (diff) | |
| parent | 3b212db9217d02e623eaa12f41c9b5f8c6a99535 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 86fb1e0286d3..c85b87cb59d1 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
| @@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) | |||
| 439 | hwif->speedproc = &via_set_drive; | 439 | hwif->speedproc = &via_set_drive; |
| 440 | 440 | ||
| 441 | 441 | ||
| 442 | #if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32) | 442 | #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) |
| 443 | if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { | 443 | if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { |
| 444 | hwif->irq = hwif->channel ? 15 : 14; | 444 | hwif->irq = hwif->channel ? 15 : 14; |
| 445 | } | 445 | } |