diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/serial_ks8695.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index 998e89dc5aaf..e0665630e4da 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c | |||
@@ -549,7 +549,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = { | |||
549 | .mapbase = KS8695_UART_VA, | 549 | .mapbase = KS8695_UART_VA, |
550 | .iotype = SERIAL_IO_MEM, | 550 | .iotype = SERIAL_IO_MEM, |
551 | .irq = KS8695_IRQ_UART_TX, | 551 | .irq = KS8695_IRQ_UART_TX, |
552 | .uartclk = CLOCK_TICK_RATE * 16, | 552 | .uartclk = KS8695_CLOCK_RATE * 16, |
553 | .fifosize = 16, | 553 | .fifosize = 16, |
554 | .ops = &ks8695uart_pops, | 554 | .ops = &ks8695uart_pops, |
555 | .flags = ASYNC_BOOT_AUTOCONF, | 555 | .flags = ASYNC_BOOT_AUTOCONF, |
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 00b03eb43bf0..e1c82769b08e 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c | |||
@@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void) | |||
66 | static inline void ks8695_wdt_start(void) | 66 | static inline void ks8695_wdt_start(void) |
67 | { | 67 | { |
68 | unsigned long tmcon; | 68 | unsigned long tmcon; |
69 | unsigned long tval = wdt_time * CLOCK_TICK_RATE; | 69 | unsigned long tval = wdt_time * KS8695_CLOCK_RATE; |
70 | 70 | ||
71 | spin_lock(&ks8695_lock); | 71 | spin_lock(&ks8695_lock); |
72 | /* disable timer0 */ | 72 | /* disable timer0 */ |
@@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void) | |||
103 | static int ks8695_wdt_settimeout(int new_time) | 103 | static int ks8695_wdt_settimeout(int new_time) |
104 | { | 104 | { |
105 | /* | 105 | /* |
106 | * All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz | 106 | * All counting occurs at KS8695_CLOCK_RATE / 128 = 0.256 Hz |
107 | * | 107 | * |
108 | * Since WDV is a 16-bit counter, the maximum period is | 108 | * Since WDV is a 16-bit counter, the maximum period is |
109 | * 65536 / 0.256 = 256 seconds. | 109 | * 65536 / 0.256 = 256 seconds. |