projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
drivers
/
ide
/
pci
/
via82cxxx.c
diff --git
a/drivers/ide/pci/via82cxxx.c
b/drivers/ide/pci/via82cxxx.c
index
86fb1e0
..
3e677c4
100644
(file)
--- a/
drivers/ide/pci/via82cxxx.c
+++ b/
drivers/ide/pci/via82cxxx.c
@@
-439,8
+439,8
@@
static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
hwif->speedproc = &via_set_drive;
hwif->speedproc = &via_set_drive;
-#if defined(CONFIG_PPC_
MULTIPLATFORM
) && defined(CONFIG_PPC32)
- if(
_machine == _MACH_chrp
&& _chrp_type == _CHRP_Pegasos) {
+#if defined(CONFIG_PPC_
CHRP
) && defined(CONFIG_PPC32)
+ if(
machine_is(chrp)
&& _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}
#endif
hwif->irq = hwif->channel ? 15 : 14;
}
#endif