git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
mac
/
config.c
diff --git
a/arch/m68k/mac/config.c
b/arch/m68k/mac/config.c
index
14f8d3f
..
562b38d
100644
(file)
--- a/
arch/m68k/mac/config.c
+++ b/
arch/m68k/mac/config.c
@@
-10,7
+10,6
@@
* Miscellaneous linux stuff
*/
* Miscellaneous linux stuff
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-73,7
+72,7
@@
extern int show_mac_interrupts(struct seq_file *, void *);
extern void iop_preinit(void);
extern void iop_init(void);
extern void via_init(void);
extern void iop_preinit(void);
extern void iop_init(void);
extern void via_init(void);
-extern void via_init_clock(irq
return_t (*func)(int, void *, struct pt_regs *)
);
+extern void via_init_clock(irq
_handler_t func
);
extern void via_flush_cache(void);
extern void oss_init(void);
extern void psc_init(void);
extern void via_flush_cache(void);
extern void oss_init(void);
extern void psc_init(void);
@@
-89,38
+88,11
@@
extern void mac_debugging_long(int, long);
static void mac_get_model(char *str);
static void mac_get_model(char *str);
-void mac_bang(int irq, void *vector, struct pt_regs *p)
-{
- printk(KERN_INFO "Resetting ...\n");
- mac_reset();
-}
-
-static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *))
+static void mac_sched_init(irq_handler_t vector)
{
via_init_clock(vector);
}
{
via_init_clock(vector);
}
-#if 0
-void mac_waitbut (void)
-{
- ;
-}
-#endif
-
-extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *);
-
-irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)=
-{
- mac_default_handler,
- mac_default_handler,
- mac_default_handler,
- mac_default_handler,
- mac_default_handler,
- mac_default_handler,
- mac_default_handler,
- mac_default_handler
-};
-
/*
* Parse a Macintosh-specific record in the bootinfo
*/
/*
* Parse a Macintosh-specific record in the bootinfo
*/
@@
-196,13
+168,7
@@
void __init config_mac(void)
mach_sched_init = mac_sched_init;
mach_init_IRQ = mac_init_IRQ;
mach_sched_init = mac_sched_init;
mach_init_IRQ = mac_init_IRQ;
- mach_request_irq = mac_request_irq;
- mach_free_irq = mac_free_irq;
- enable_irq = mac_enable_irq;
- disable_irq = mac_disable_irq;
mach_get_model = mac_get_model;
mach_get_model = mac_get_model;
- mach_default_handler = &mac_handlers;
- mach_get_irq_list = show_mac_interrupts;
mach_gettimeoffset = mac_gettimeoffset;
#warning move to adb/via init
#if 0
mach_gettimeoffset = mac_gettimeoffset;
#warning move to adb/via init
#if 0