diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-13 04:41:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-13 04:41:55 -0800 |
| commit | 2d202ddc980bdab29aa5deb8643c531a72654df9 (patch) | |
| tree | 04765de57cbf024588b6a288c91c2bbf47e03d84 /include/linux | |
| parent | 2e3a2627f7d05f78a05a4f592f25038eb858ea4d (diff) | |
| parent | 4b355b37533a900531a02df6e8714a2838033018 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index bba805dd7a39..3fad76b0873c 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -94,6 +94,9 @@ /*IBM icom*/ #define PORT_ICOM 60 +/* Samsung S3C2440 SoC */ +#define PORT_S3C2440 61 + #ifdef __KERNEL__ #include <linux/config.h> @@ -171,7 +174,7 @@ struct uart_icount { struct uart_port { spinlock_t lock; /* port lock */ unsigned int iobase; /* in/out[bwl] */ - char *membase; /* read/write[bwl] */ + unsigned char __iomem *membase; /* read/write[bwl] */ unsigned int irq; /* irq number */ unsigned int uartclk; /* base uart clock */ unsigned char fifosize; /* tx fifo size */ |