diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/powerpc/sysdev | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/sysdev')
| -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; | |||
| 61 | of space for CPM as it is larger | 61 | of space for CPM as it is larger |
| 62 | than on PQ2 */ | 62 | than on PQ2 */ |
| 63 | 63 | ||
| 64 | void | 64 | void __init cpm2_reset(void) |
| 65 | cpm2_reset(void) | ||
| 66 | { | 65 | { |
| 67 | #ifdef CONFIG_PPC_85xx | 66 | #ifdef CONFIG_PPC_85xx |
| 68 | cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); | 67 | cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); |