diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 14:28:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 14:28:30 -0500 |
commit | 76babde121d2ffef04ca692ce64ef9f8a9866086 (patch) | |
tree | 294923bbb4974258d86d223e35eee691abacdfb1 /drivers/ieee1394/ohci1394.c | |
parent | e71ac6032edf77a1e4a81f3e3b260807e94b37a5 (diff) | |
parent | 15e812ad849e142e3dfc984d33c4d8042389f148 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
[PATCH] powerpc: Remove oprofile spinlock backtrace code
[PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
[PATCH] powerpc: Add oprofile calltrace support
[PATCH] for_each_possible_cpu: ppc
[PATCH] for_each_possible_cpu: powerpc
[PATCH] lock PTE before updating it in 440/BookE page fault handler
[PATCH] powerpc: Kill _machine and hard-coded platform numbers
ppc: Fix compile error in arch/ppc/lib/strcase.c
[PATCH] git-powerpc: WARN was a dumb idea
[PATCH] powerpc: a couple of trivial compile warning fixes
powerpc: remove OCP references
powerpc: Make uImage default build output for MPC8540 ADS
powerpc: move math-emu over to arch/powerpc
powerpc: use memparse() for mem= command line parsing
ppc: fix strncasecmp prototype
[PATCH] powerpc: make ISA floppies work again
[PATCH] powerpc: Fix some initcall return values
[PATCH] powerpc: Workaround for pSeries RTAS bug
[PATCH] spufs: fix __init/__exit annotations
[PATCH] powerpc: add hvc backend for rtas
...
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index a86beeb6af5d..19222878aae9 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -3529,7 +3529,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) | |||
3529 | static int ohci1394_pci_resume (struct pci_dev *pdev) | 3529 | static int ohci1394_pci_resume (struct pci_dev *pdev) |
3530 | { | 3530 | { |
3531 | #ifdef CONFIG_PPC_PMAC | 3531 | #ifdef CONFIG_PPC_PMAC |
3532 | if (_machine == _MACH_Pmac) { | 3532 | if (machine_is(powermac)) { |
3533 | struct device_node *of_node; | 3533 | struct device_node *of_node; |
3534 | 3534 | ||
3535 | /* Re-enable 1394 */ | 3535 | /* Re-enable 1394 */ |
@@ -3548,7 +3548,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev) | |||
3548 | static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) | 3548 | static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) |
3549 | { | 3549 | { |
3550 | #ifdef CONFIG_PPC_PMAC | 3550 | #ifdef CONFIG_PPC_PMAC |
3551 | if (_machine == _MACH_Pmac) { | 3551 | if (machine_is(powermac)) { |
3552 | struct device_node *of_node; | 3552 | struct device_node *of_node; |
3553 | 3553 | ||
3554 | /* Disable 1394 */ | 3554 | /* Disable 1394 */ |