diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
| commit | 9a375e93f88269bb770fb2eaa57554c975449c88 (patch) | |
| tree | 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /arch/powerpc/kernel/rtas-proc.c | |
| parent | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into max-sect
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 456286cf1d14..9c9ad1fa9cce 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) | |||
| 258 | struct proc_dir_entry *entry; | 258 | struct proc_dir_entry *entry; |
| 259 | 259 | ||
| 260 | if (!machine_is(pseries)) | 260 | if (!machine_is(pseries)) |
| 261 | return 1; | 261 | return -ENODEV; |
| 262 | 262 | ||
| 263 | rtas_node = of_find_node_by_name(NULL, "rtas"); | 263 | rtas_node = of_find_node_by_name(NULL, "rtas"); |
| 264 | if (rtas_node == NULL) | 264 | if (rtas_node == NULL) |
| 265 | return 1; | 265 | return -ENODEV; |
| 266 | 266 | ||
| 267 | entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL); | 267 | entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL); |
| 268 | if (entry) | 268 | if (entry) |