git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
nvram.c
diff --git
a/arch/ppc64/kernel/nvram.c
b/arch/ppc64/kernel/nvram.c
index
89d6a0a
..
49ddf5e
100644
(file)
--- a/
arch/ppc64/kernel/nvram.c
+++ b/
arch/ppc64/kernel/nvram.c
@@
-340,7
+340,7
@@
static int nvram_create_os_partition(void)
struct list_head * p;
struct nvram_partition * part;
struct nvram_partition * new_part = NULL;
struct list_head * p;
struct nvram_partition * part;
struct nvram_partition * new_part = NULL;
- struct nvram_partition * free_part;
+ struct nvram_partition * free_part
= NULL
;
int seq_init[2] = { 0, 0 };
loff_t tmp_index;
long size = 0;
int seq_init[2] = { 0, 0 };
loff_t tmp_index;
long size = 0;
@@
-603,6
+603,7
@@
void __exit nvram_cleanup(void)
}
}
+#ifdef CONFIG_PPC_PSERIES
/* nvram_write_error_log
*
/* nvram_write_error_log
*
@@
-727,6
+728,7
@@
int nvram_clear_error_log()
return 0;
}
return 0;
}
+#endif /* CONFIG_PPC_PSERIES */
module_init(nvram_init);
module_exit(nvram_cleanup);
module_init(nvram_init);
module_exit(nvram_cleanup);