diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/serial/m32r_sio.h | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
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 | ||