summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/8250_pci.c6
-rw-r--r--include/linux/serial_core.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 544c435d6545..0e56087742ee 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -283,7 +283,7 @@ static int __devinit pci_plx9050_init(struct pci_dev *dev)
static void __devexit pci_plx9050_exit(struct pci_dev *dev)
{
- u8 *p;
+ u8 __iomem *p;
if ((pci_resource_flags(dev, 0) & IORESOURCE_MEM) == 0)
return;
@@ -336,7 +336,7 @@ sbs_setup(struct pci_dev *dev, struct pci_board *board,
static int __devinit sbs_init(struct pci_dev *dev)
{
- u8 * p;
+ u8 __iomem *p;
p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
@@ -360,7 +360,7 @@ static int __devinit sbs_init(struct pci_dev *dev)
static void __devexit sbs_exit(struct pci_dev *dev)
{
- u8 * p;
+ u8 __iomem *p;
p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
if (p != NULL) {
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index bba805dd7a39..ae0b9948c269 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -171,7 +171,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 */