diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 20:19:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 20:19:56 -0400 |
| commit | adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4 (patch) | |
| tree | d8a1f9223b3b7384af7f653a519032b69ef60e0c /drivers/serial | |
| parent | f46f6b20cb01508f5020142ff91021f8fb39550b (diff) | |
| parent | 691027b91be99413dc60fab0902b366434555015 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/s3c2410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 2a9f7ade2c9d..5c4678478b1d 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -198,7 +198,7 @@ static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) | |||
| 198 | 198 | ||
| 199 | /* translate a port to the device name */ | 199 | /* translate a port to the device name */ |
| 200 | 200 | ||
| 201 | static inline char *s3c24xx_serial_portname(struct uart_port *port) | 201 | static inline const char *s3c24xx_serial_portname(struct uart_port *port) |
| 202 | { | 202 | { |
| 203 | return to_platform_device(port->dev)->name; | 203 | return to_platform_device(port->dev)->name; |
| 204 | } | 204 | } |
| @@ -903,7 +903,7 @@ static void s3c24xx_serial_release_port(struct uart_port *port) | |||
| 903 | 903 | ||
| 904 | static int s3c24xx_serial_request_port(struct uart_port *port) | 904 | static int s3c24xx_serial_request_port(struct uart_port *port) |
| 905 | { | 905 | { |
| 906 | char *name = s3c24xx_serial_portname(port); | 906 | const char *name = s3c24xx_serial_portname(port); |
| 907 | return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY; | 907 | return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY; |
| 908 | } | 908 | } |
| 909 | 909 | ||