diff options
| author | Paul Mackerras | 2007-12-21 12:21:08 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2007-12-21 12:21:08 +0100 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/powerpc/sysdev/cpm2_common.c | |
| parent | [POWERPC] Make non-PCI build work again (diff) | |
| parent | Linux 2.6.24-rc6 (diff) | |
| download | kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.gz kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.xz kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip | |
Merge branch 'linux-2.6'
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 0a7054579d98..f7188e2ba669 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); |