diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/ppc/platforms/4xx/walnut.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/ppc/platforms/4xx/walnut.c')
| -rw-r--r-- | arch/ppc/platforms/4xx/walnut.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c index a33eda4b7489..74cb33182d9f 100644 --- a/arch/ppc/platforms/4xx/walnut.c +++ b/arch/ppc/platforms/4xx/walnut.c | |||
| @@ -90,7 +90,7 @@ walnut_setup_arch(void) | |||
| 90 | 90 | ||
| 91 | kb_cs = kb_data + 1; | 91 | kb_cs = kb_data + 1; |
| 92 | 92 | ||
| 93 | fpga_status = ioremap(WALNUT_FPGA_BASE, 8); | 93 | fpga_status = ioremap(PPC40x_FPGA_BASE, 8); |
| 94 | if (!fpga_status) { | 94 | if (!fpga_status) { |
| 95 | printk(KERN_CRIT | 95 | printk(KERN_CRIT |
| 96 | "walnut_setup_arch() fpga_status ioremap failed\n"); | 96 | "walnut_setup_arch() fpga_status ioremap failed\n"); |