diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:19:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:19:56 -0700 |
| commit | adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4 (patch) | |
| tree | d8a1f9223b3b7384af7f653a519032b69ef60e0c /drivers | |
| parent | f46f6b20cb01508f5020142ff91021f8fb39550b (diff) | |
| parent | 691027b91be99413dc60fab0902b366434555015 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/s3c2410.c | 4 | ||||
| -rw-r--r-- | drivers/video/pxafb.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 2a9f7ade2c9..5c4678478b1 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) /* translate a port to the device name */ -static inline char *s3c24xx_serial_portname(struct uart_port *port) +static inline const char *s3c24xx_serial_portname(struct uart_port *port) { return to_platform_device(port->dev)->name; } @@ -903,7 +903,7 @@ static void s3c24xx_serial_release_port(struct uart_port *port) static int s3c24xx_serial_request_port(struct uart_port *port) { - char *name = s3c24xx_serial_portname(port); + const char *name = s3c24xx_serial_portname(port); return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY; } diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 815fbc8317f..16e37a535d8 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -43,6 +43,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/uaccess.h> +#include <asm/div64.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/bitfield.h> #include <asm/arch/pxafb.h> @@ -460,7 +461,7 @@ static inline unsigned int get_pcd(unsigned int pixclock) * speeds */ pcd = (unsigned long long)get_lcdclk_frequency_10khz() * pixclock; - pcd /= 100000000 * 2; + do_div(pcd, 100000000 * 2); /* no need for this, since we should subtract 1 anyway. they cancel */ /* pcd += 1; */ /* make up for integer math truncations */ return (unsigned int)pcd; |