diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-14 16:46:50 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-14 16:46:50 +1100 |
| commit | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (patch) | |
| tree | 769284bd2000bb80e49a6d23df61e3fedc947c64 /arch/powerpc/sysdev/cpm2_common.c | |
| parent | eb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d (diff) | |
| parent | c89686210542f6946e48a907772a356b9fce03f0 (diff) | |
| download | talos-obmc-linux-280bb6b1f76aaec29a721b1025ec5d69afba57e8.tar.gz talos-obmc-linux-280bb6b1f76aaec29a721b1025ec5d69afba57e8.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/sysdev/cpm2_common.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c index 859362fecb7c..c1d824032020 100644 --- a/arch/powerpc/sysdev/cpm2_common.c +++ b/arch/powerpc/sysdev/cpm2_common.c @@ -61,8 +61,7 @@ cpm2_map_t __iomem *cpm2_immr; of space for CPM as it is larger than on PQ2 */ -void -cpm2_reset(void) +void __init cpm2_reset(void) { #ifdef CONFIG_PPC_85xx cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); |
