aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/q40/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/q40/config.c')
-rw-r--r--arch/m68k/q40/config.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index be9de2f3dc48..7110546e3c00 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -23,6 +23,7 @@
23#include <linux/serial_reg.h> 23#include <linux/serial_reg.h>
24#include <linux/rtc.h> 24#include <linux/rtc.h>
25#include <linux/vt_kern.h> 25#include <linux/vt_kern.h>
26#include <linux/bcd.h>
26 27
27#include <asm/io.h> 28#include <asm/io.h>
28#include <asm/rtc.h> 29#include <asm/rtc.h>
@@ -38,7 +39,6 @@
38extern irqreturn_t q40_process_int(int level, struct pt_regs *regs); 39extern irqreturn_t q40_process_int(int level, struct pt_regs *regs);
39extern void q40_init_IRQ(void); 40extern void q40_init_IRQ(void);
40static void q40_get_model(char *model); 41static void q40_get_model(char *model);
41static int q40_get_hardware_list(char *buffer);
42extern void q40_sched_init(irq_handler_t handler); 42extern void q40_sched_init(irq_handler_t handler);
43 43
44static unsigned long q40_gettimeoffset(void); 44static unsigned long q40_gettimeoffset(void);
@@ -152,14 +152,6 @@ static void q40_get_model(char *model)
152 sprintf(model, "Q40"); 152 sprintf(model, "Q40");
153} 153}
154 154
155/* No hardware options on Q40? */
156
157static int q40_get_hardware_list(char *buffer)
158{
159 *buffer = '\0';
160 return 0;
161}
162
163static unsigned int serports[] = 155static unsigned int serports[] =
164{ 156{
165 0x3f8,0x2f8,0x3e8,0x2e8,0 157 0x3f8,0x2f8,0x3e8,0x2e8,0
@@ -190,7 +182,6 @@ void __init config_q40(void)
190 182
191 mach_reset = q40_reset; 183 mach_reset = q40_reset;
192 mach_get_model = q40_get_model; 184 mach_get_model = q40_get_model;
193 mach_get_hardware_list = q40_get_hardware_list;
194 185
195#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) 186#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
196 mach_beep = q40_mksound; 187 mach_beep = q40_mksound;
@@ -216,17 +207,6 @@ int q40_parse_bootinfo(const struct bi_record *rec)
216} 207}
217 208
218 209
219static inline unsigned char bcd2bin(unsigned char b)
220{
221 return (b >> 4) * 10 + (b & 15);
222}
223
224static inline unsigned char bin2bcd(unsigned char b)
225{
226 return (b / 10) * 16 + (b % 10);
227}
228
229
230static unsigned long q40_gettimeoffset(void) 210static unsigned long q40_gettimeoffset(void)
231{ 211{
232 return 5000 * (ql_ticks != 0); 212 return 5000 * (ql_ticks != 0);