diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
| commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
| tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/ppc/syslib | |
| parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
| parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/ppc/syslib')
| -rw-r--r-- | arch/ppc/syslib/ppc83xx_setup.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc85xx_setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c index 1b5fe9e398d4..7bada82527a8 100644 --- a/arch/ppc/syslib/ppc83xx_setup.c +++ b/arch/ppc/syslib/ppc83xx_setup.c | |||
| @@ -108,7 +108,7 @@ mpc83xx_early_serial_map(void) | |||
| 108 | 108 | ||
| 109 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | 109 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) |
| 110 | memset(&serial_req, 0, sizeof (serial_req)); | 110 | memset(&serial_req, 0, sizeof (serial_req)); |
| 111 | serial_req.iotype = SERIAL_IO_MEM; | 111 | serial_req.iotype = UPIO_MEM; |
| 112 | serial_req.mapbase = pdata[0].mapbase; | 112 | serial_req.mapbase = pdata[0].mapbase; |
| 113 | serial_req.membase = pdata[0].membase; | 113 | serial_req.membase = pdata[0].membase; |
| 114 | serial_req.regshift = 0; | 114 | serial_req.regshift = 0; |
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c index 1a47ff4b831d..e4dda43fdaa7 100644 --- a/arch/ppc/syslib/ppc85xx_setup.c +++ b/arch/ppc/syslib/ppc85xx_setup.c | |||
| @@ -90,7 +90,7 @@ mpc85xx_early_serial_map(void) | |||
| 90 | 90 | ||
| 91 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | 91 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) |
| 92 | memset(&serial_req, 0, sizeof (serial_req)); | 92 | memset(&serial_req, 0, sizeof (serial_req)); |
| 93 | serial_req.iotype = SERIAL_IO_MEM; | 93 | serial_req.iotype = UPIO_MEM; |
| 94 | serial_req.mapbase = pdata[0].mapbase; | 94 | serial_req.mapbase = pdata[0].mapbase; |
| 95 | serial_req.membase = pdata[0].membase; | 95 | serial_req.membase = pdata[0].membase; |
| 96 | serial_req.regshift = 0; | 96 | serial_req.regshift = 0; |