A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages 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
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;
}