diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 13:25:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 13:25:13 -0400 |
| commit | 43df5eac00734436e2bc5a5c11488b1a7accecc7 (patch) | |
| tree | c830ffbdea3c6ab00f31afeedc26392bd4a55d63 /drivers | |
| parent | 7be426c6e3a8ad7dcc8791589cea8af7aaafdf6f (diff) | |
| parent | e55c57e0b51c68d78845549505057169c6c3cba6 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sunzilog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 5c4231ae295b..8e65206d3d76 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
| @@ -1071,7 +1071,7 @@ static void __init sunzilog_alloc_tables(void) | |||
| 1071 | */ | 1071 | */ |
| 1072 | static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode) | 1072 | static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode) |
| 1073 | { | 1073 | { |
| 1074 | unsigned long mapped_addr; | 1074 | void __iomem *mapped_addr; |
| 1075 | unsigned int sun4u_ino; | 1075 | unsigned int sun4u_ino; |
| 1076 | struct sbus_bus *sbus = NULL; | 1076 | struct sbus_bus *sbus = NULL; |
| 1077 | struct sbus_dev *sdev = NULL; | 1077 | struct sbus_dev *sdev = NULL; |
| @@ -1111,9 +1111,9 @@ static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode) | |||
| 1111 | apply_fhc_ranges(central_bus->child, | 1111 | apply_fhc_ranges(central_bus->child, |
| 1112 | &zsregs[0], 1); | 1112 | &zsregs[0], 1); |
| 1113 | apply_central_ranges(central_bus, &zsregs[0], 1); | 1113 | apply_central_ranges(central_bus, &zsregs[0], 1); |
| 1114 | mapped_addr = | 1114 | mapped_addr = (void __iomem *) |
| 1115 | (((u64)zsregs[0].which_io)<<32UL) | | 1115 | ((((u64)zsregs[0].which_io)<<32UL) | |
| 1116 | ((u64)zsregs[0].phys_addr); | 1116 | ((u64)zsregs[0].phys_addr)); |
| 1117 | } | 1117 | } |
| 1118 | 1118 | ||
| 1119 | if (zilog_irq == -1) { | 1119 | if (zilog_irq == -1) { |