diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 17:34:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 17:34:24 (GMT) |
| commit | 6fbe85f914ad08cc43408a40ad18a561222e1b93 (patch) | |
| tree | 320da01ba20dcbf6d31d80d35b1217193d663814 /arch/powerpc/kernel/rtas-proc.c | |
| parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) | |
| parent | f39224a8c1828bdd327539da72a53d8a13595838 (diff) | |
| download | linux-fsl-qoriq-6fbe85f914ad08cc43408a40ad18a561222e1b93.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Use correct sequence for putting CPU into nap mode
[PATCH] spufs: fix context-switch decrementer code
[PATCH] powerpc32: Set cpu explicitly in kernel compiles
[PATCH] powerpc/pseries: bugfix: balance calls to pci_device_put
[PATCH] powerpc: Fix machine detection in prom_init.c
[PATCH] ppc32: Fix string comparing in platform_notify_map
[PATCH] powerpc: Avoid __initcall warnings
[PATCH] powerpc: Ensure runlatch is off in the idle loop
powerpc: Fix CHRP booting - needs a define_machine call
powerpc: iSeries has only 256 IRQs
Diffstat (limited to 'arch/powerpc/kernel/rtas-proc.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas-proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c index 456286c..9c9ad1f 100644 --- a/arch/powerpc/kernel/rtas-proc.c +++ b/arch/powerpc/kernel/rtas-proc.c @@ -258,11 +258,11 @@ static int __init proc_rtas_init(void) struct proc_dir_entry *entry; if (!machine_is(pseries)) - return 1; + return -ENODEV; rtas_node = of_find_node_by_name(NULL, "rtas"); if (rtas_node == NULL) - return 1; + return -ENODEV; entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL); if (entry) |