diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /drivers/serial/m32r_sio.h | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/m32r_sio.h')
| -rw-r--r-- | drivers/serial/m32r_sio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h index 07d0dd80aa3d..7c3ec24f7e50 100644 --- a/drivers/serial/m32r_sio.h +++ b/drivers/serial/m32r_sio.h | |||
| @@ -37,7 +37,7 @@ struct old_serial_port { | |||
| 37 | unsigned int irq; | 37 | unsigned int irq; |
| 38 | unsigned int flags; | 38 | unsigned int flags; |
| 39 | unsigned char io_type; | 39 | unsigned char io_type; |
| 40 | unsigned char *iomem_base; | 40 | unsigned char __iomem *iomem_base; |
| 41 | unsigned short iomem_reg_shift; | 41 | unsigned short iomem_reg_shift; |
| 42 | }; | 42 | }; |
| 43 | 43 | ||