git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
ide
/
ppc
/
pmac.c
diff --git
a/drivers/ide/ppc/pmac.c
b/drivers/ide/ppc/pmac.c
index
ffca8b6
..
5013b12
100644
(file)
--- a/
drivers/ide/ppc/pmac.c
+++ b/
drivers/ide/ppc/pmac.c
@@
-553,8
+553,6
@@
pmac_ide_init_hwif_ports(hw_regs_t *hw,
if (irq != NULL)
*irq = pmac_ide[ix].irq;
if (irq != NULL)
*irq = pmac_ide[ix].irq;
-
- hw->dev = &pmac_ide[ix].mdev->ofdev.dev;
}
#define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x)))
}
#define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x)))
@@
-1679,7
+1677,7
@@
MODULE_DEVICE_TABLE(pci, pmac_ide_pci_match);
void __init
pmac_ide_probe(void)
{
void __init
pmac_ide_probe(void)
{
- if (
!machine_is(powermac)
)
+ if (
_machine != _MACH_Pmac
)
return;
#ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST
return;
#ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST