Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 36e25ac823dc..b3d3d22fde64 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3538,8 +3538,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
 
 static int ohci1394_pci_resume (struct pci_dev *pdev)
 {
-#ifdef CONFIG_PMAC_PBOOK
-        {
+#ifdef CONFIG_PPC_PMAC
+        if (_machine == _MACH_Pmac) {
                 struct device_node *of_node;
 
                 /* Re-enable 1394 */
@@ -3547,7 +3547,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)
                 if (of_node)
                         pmac_call_feature (PMAC_FTR_1394_ENABLE, of_node, 0, 1);
         }
-#endif
+#endif /* CONFIG_PPC_PMAC */
 
         pci_enable_device(pdev);
 
@@ -3557,8 +3557,8 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)
 
 static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 {
-#ifdef CONFIG_PMAC_PBOOK
-        {
+#ifdef CONFIG_PPC_PMAC
+        if (_machine == _MACH_Pmac) {
                 struct device_node *of_node;
 
                 /* Disable 1394 */