diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /include/asm-ppc64/nvram.h | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.gz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc64/nvram.h')
| -rw-r--r-- | include/asm-ppc64/nvram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc64/nvram.h b/include/asm-ppc64/nvram.h index dfaa21566c9..def47d720d3 100644 --- a/include/asm-ppc64/nvram.h +++ b/include/asm-ppc64/nvram.h @@ -70,7 +70,7 @@ extern struct nvram_partition *nvram_find_partition(int sig, const char *name); extern int pSeries_nvram_init(void); extern int pmac_nvram_init(void); -extern int bpa_nvram_init(void); +extern int mmio_nvram_init(void); /* PowerMac specific nvram stuffs */ |