diff --git a/[refs] b/[refs] index 4a424fb39b18..0de75cae80aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5370f1f5e94f1734f0706044bfb95007ea90fb23 +refs/heads/master: 63cca59e89892497e95e1e9c7156d3345fb7e2e8 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index 3c9dc7d24410..628130a58af3 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/drivers/ieee1394/ohci1394.c @@ -3517,7 +3517,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) #ifdef CONFIG_PPC_PMAC /* On UniNorth, power down the cable and turn off the chip clock * to save power on laptops */ - { + if (machine_is(powermac)) { struct device_node* ofn = pci_device_to_OF_node(ohci->dev); if (ofn) {