diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 18:04:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 18:04:13 -0500 |
| commit | ce362c009250340358a7221f3cdb7954cbf19c01 (patch) | |
| tree | 38b4700e51d3cce214690e7882069e0e12abf8d4 /drivers/serial/8250_gsc.c | |
| parent | 064c94f9da8845f12446ab37142aa10f3c6f66ac (diff) | |
| parent | cd7a9202a5a6e7712df2b80ed5ebd7b078130fc3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (24 commits)
[PARISC] Fix double free when removing HIL drivers
[PARISC] Add atomic_sub_and_test
[PARISC] Enabled some NLS modules in a500, b180 and c3000 defconfigs
[PARISC] Kill duplicated EXPORT_SYMBOL warnings
[PARISC] Move ioremap EXPORT_SYMBOL from parisc_ksyms.c
[PARISC] Make local_t use atomic_long_t
[PARISC] Update defconfigs
[PARISC] Add PREEMPT support
[PARISC] More useful readwrite lock helpers
[PARISC] Convert HIL drivers to use input_allocate_device
[PARISC] Fixup CONFIG_EISA a bit
[PARISC] getsockopt should be ENTRY_COMP
[PARISC] Remove obsolete CONFIG_DEBUG_IOREMAP
[PARISC] Temporary FIXME for ioremapping EISA regions
[PARISC] Enable ioremap functionality unconditionally
[PARISC] Fix stifb with IOREMAP and a 64-bit kernel
[PARISC] Add CONFIG_HPPA_IOREMAP to conditionally enable ioremap
[PARISC] Add STRICT_MM_TYPECHECKS
[PARISC] Fix IOREMAP with a 64-bit kernel
[PARISC] Add parisc implementation of flush_kernel_dcache_page()
...
Diffstat (limited to 'drivers/serial/8250_gsc.c')
| -rw-r--r-- | drivers/serial/8250_gsc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c index 8b4947933d9b..913c71cc0569 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/serial/8250_gsc.c | |||
| @@ -52,13 +52,14 @@ serial_init_chip(struct parisc_device *dev) | |||
| 52 | address += 0x800; | 52 | address += 0x800; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | memset(&port, 0, sizeof(struct uart_port)); | 55 | memset(&port, 0, sizeof(port)); |
| 56 | port.mapbase = address; | 56 | port.iotype = UPIO_MEM; |
| 57 | port.irq = dev->irq; | 57 | port.uartclk = LASI_BASE_BAUD * 16; |
| 58 | port.iotype = UPIO_MEM; | 58 | port.mapbase = address; |
| 59 | port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; | 59 | port.membase = ioremap_nocache(address, 16); |
| 60 | port.uartclk = LASI_BASE_BAUD * 16; | 60 | port.irq = dev->irq; |
| 61 | port.dev = &dev->dev; | 61 | port.flags = UPF_BOOT_AUTOCONF; |
| 62 | port.dev = &dev->dev; | ||
| 62 | 63 | ||
| 63 | err = serial8250_register_port(&port); | 64 | err = serial8250_register_port(&port); |
| 64 | if (err < 0) { | 65 | if (err < 0) { |