lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

Browse Source
This commit is contained in:
Linus Torvalds
2006-01-10 08:28:32 -08:00
parent ab396e91bf 3b212db921
commit a62e68488d
22 changed files with 896 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/pci/via82cxxx.c
View File

@@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
hwif->speedproc = &via_set_drive;
#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}