3 files changed, 7 insertions, 75 deletions
diff --git a/include/asm-m68k/adb.h b/include/asm-m68k/adb.h
deleted file mode 100644
index 9176b55185bb..000000000000
--- a/include/asm-m68k/adb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Definitions for talking to ADB and CUDA.  The CUDA is a microcontroller
- * which controls the ADB, system power, RTC, and various other things on
- * later Macintoshes
- *
- * Copyright (C) 1996 Paul Mackerras.
- */
-/* First byte sent to or received from CUDA */
-#define ADB_PACKET      0
-#define CUDA_PACKET     1
-#define ERROR_PACKET    2
-#define TIMER_PACKET    3
-#define POWER_PACKET    4
-#define MACIIC_PACKET   5
-/* ADB commands (2nd byte) */
-#define ADB_BUSRESET            0
-#define ADB_FLUSH(id)           (1 + ((id) << 4))
-#define ADB_WRITEREG(id, reg)   (8 + (reg) + ((id) << 4))
-#define ADB_READREG(id, reg)    (0xc + (reg) + ((id) << 4))
-/* ADB default device IDs (upper 4 bits of 2nd byte) */
-#define ADB_DONGLE      1       /* "software execution control" devices */
-#define ADB_KEYBOARD    2
-#define ADB_MOUSE       3
-#define ADB_TABLET      4
-#define ADB_MODEM       5
-#define ADB_MISC        7       /* maybe a monitor */
-/* CUDA commands (2nd byte) */
-#define CUDA_WARM_START         0
-#define CUDA_AUTOPOLL           1
-#define CUDA_GET_6805_ADDR      2
-#define CUDA_GET_TIME           3
-#define CUDA_GET_PRAM           7
-#define CUDA_SET_6805_ADDR      8
-#define CUDA_SET_TIME           9
-#define CUDA_POWERDOWN          0xa
-#define CUDA_POWERUP_TIME       0xb
-#define CUDA_SET_PRAM           0xc
-#define CUDA_MS_RESET           0xd
-#define CUDA_SEND_DFAC          0xe
-#define CUDA_RESET_SYSTEM       0x11
-#define CUDA_SET_IPL            0x12
-#define CUDA_SET_AUTO_RATE      0x14
-#define CUDA_GET_AUTO_RATE      0x16
-#define CUDA_SET_DEVICE_LIST    0x19
-#define CUDA_GET_DEVICE_LIST    0x1a
-#define CUDA_GET_SET_IIC        0x22
-#ifdef __KERNEL__
-struct adb_request {
-    unsigned char data[16];
-    int nbytes;
-    unsigned char reply[16];
-    int reply_len;
-    unsigned char reply_expected;
-    unsigned char sent;
-    unsigned char got_reply;
-    void (*done)(struct adb_request *);
-    void *arg;
-    struct adb_request *next;
-};
-void via_adb_init(void);
-int adb_request(struct adb_request *req,
-                 void (*done)(struct adb_request *), int nbytes, ...);
-int adb_send_request(struct adb_request *req);
-void adb_poll(void);
-int adb_register(int default_id,
-                 void (*handler)(unsigned char *, int, struct pt_regs *));
-#endif  /* __KERNEL */
diff --git a/include/asm-m68k/atarikb.h b/include/asm-m68k/atarikb.h
index 18926058fde7..546e7da5804f 100644
--- a/include/asm-m68k/atarikb.h
+++ b/include/asm-m68k/atarikb.h
@@ -36,5 +36,11 @@ void ikbd_joystick_disable(void);
 extern void (*atari_MIDI_interrupt_hook) (void);
 /* Hook for mouse driver */
 extern void (*atari_mouse_interrupt_hook) (char *);
+/* Hook for keyboard inputdev  driver */
+extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
+/* Hook for mouse inputdev  driver */
+extern void (*atari_input_mouse_interrupt_hook) (char *);
+int atari_keyb_init(void);
 #endif /* _LINUX_ATARIKB_H */
diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h
index 231d11bd8e32..894dacbcee14 100644
--- a/include/asm-m68k/mmu_context.h
+++ b/include/asm-m68k/mmu_context.h
@@ -1,6 +1,7 @@
 #ifndef __M68K_MMU_CONTEXT_H
 #define __M68K_MMU_CONTEXT_H
+#include <asm-generic/mm_hooks.h>
 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 {

diff --git a/include/asm-m68k/adb.h b/include/asm-m68k/adb.h deleted file mode 100644 index 9176b55185bb..000000000000 --- a/include/asm-m68k/adb.h +++ /dev/null
@@ -1,75 +0,0 @@
1	/*
2	* Definitions for talking to ADB and CUDA. The CUDA is a microcontroller
3	* which controls the ADB, system power, RTC, and various other things on
4	* later Macintoshes
5	*
6	* Copyright (C) 1996 Paul Mackerras.
7	*/
8
9	/* First byte sent to or received from CUDA */
10	#define ADB_PACKET 0
11	#define CUDA_PACKET 1
12	#define ERROR_PACKET 2
13	#define TIMER_PACKET 3
14	#define POWER_PACKET 4
15	#define MACIIC_PACKET 5
16
17	/* ADB commands (2nd byte) */
18	#define ADB_BUSRESET 0
19	#define ADB_FLUSH(id) (1 + ((id) << 4))
20	#define ADB_WRITEREG(id, reg) (8 + (reg) + ((id) << 4))
21	#define ADB_READREG(id, reg) (0xc + (reg) + ((id) << 4))
22
23	/* ADB default device IDs (upper 4 bits of 2nd byte) */
24	#define ADB_DONGLE 1 /* "software execution control" devices */
25	#define ADB_KEYBOARD 2
26	#define ADB_MOUSE 3
27	#define ADB_TABLET 4
28	#define ADB_MODEM 5
29	#define ADB_MISC 7 /* maybe a monitor */
30
31	/* CUDA commands (2nd byte) */
32	#define CUDA_WARM_START 0
33	#define CUDA_AUTOPOLL 1
34	#define CUDA_GET_6805_ADDR 2
35	#define CUDA_GET_TIME 3
36	#define CUDA_GET_PRAM 7
37	#define CUDA_SET_6805_ADDR 8
38	#define CUDA_SET_TIME 9
39	#define CUDA_POWERDOWN 0xa
40	#define CUDA_POWERUP_TIME 0xb
41	#define CUDA_SET_PRAM 0xc
42	#define CUDA_MS_RESET 0xd
43	#define CUDA_SEND_DFAC 0xe
44	#define CUDA_RESET_SYSTEM 0x11
45	#define CUDA_SET_IPL 0x12
46	#define CUDA_SET_AUTO_RATE 0x14
47	#define CUDA_GET_AUTO_RATE 0x16
48	#define CUDA_SET_DEVICE_LIST 0x19
49	#define CUDA_GET_DEVICE_LIST 0x1a
50	#define CUDA_GET_SET_IIC 0x22
51
52	#ifdef __KERNEL__
53
54	struct adb_request {
55	unsigned char data[16];
56	int nbytes;
57	unsigned char reply[16];
58	int reply_len;
59	unsigned char reply_expected;
60	unsigned char sent;
61	unsigned char got_reply;
62	void (done)(struct adb_request );
63	void *arg;
64	struct adb_request *next;
65	};
66
67	void via_adb_init(void);
68	int adb_request(struct adb_request *req,
69	void (done)(struct adb_request ), int nbytes, ...);
70	int adb_send_request(struct adb_request *req);
71	void adb_poll(void);
72	int adb_register(int default_id,
73	void (handler)(unsigned char , int, struct pt_regs *));
74
75	#endif /* __KERNEL */


diff --git a/include/asm-m68k/atarikb.h b/include/asm-m68k/atarikb.h index 18926058fde7..546e7da5804f 100644 --- a/include/asm-m68k/atarikb.h +++ b/include/asm-m68k/atarikb.h
@@ -36,5 +36,11 @@ void ikbd_joystick_disable(void);
36	extern void (*atari_MIDI_interrupt_hook) (void);	36	extern void (*atari_MIDI_interrupt_hook) (void);
37	/* Hook for mouse driver */	37	/* Hook for mouse driver */
38	extern void (atari_mouse_interrupt_hook) (char );	38	extern void (atari_mouse_interrupt_hook) (char );
		39	/* Hook for keyboard inputdev driver */
		40	extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
		41	/* Hook for mouse inputdev driver */
		42	extern void (atari_input_mouse_interrupt_hook) (char );
		43
		44	int atari_keyb_init(void);
39		45
40	#endif /* _LINUX_ATARIKB_H */	46	#endif /* _LINUX_ATARIKB_H */


diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h index 231d11bd8e32..894dacbcee14 100644 --- a/include/asm-m68k/mmu_context.h +++ b/include/asm-m68k/mmu_context.h
@@ -1,6 +1,7 @@
1	#ifndef __M68K_MMU_CONTEXT_H	1	#ifndef __M68K_MMU_CONTEXT_H
2	#define __M68K_MMU_CONTEXT_H	2	#define __M68K_MMU_CONTEXT_H
3		3
		4	#include <asm-generic/mm_hooks.h>
4		5
5	static inline void enter_lazy_tlb(struct mm_struct mm, struct task_struct tsk)	6	static inline void enter_lazy_tlb(struct mm_struct mm, struct task_struct tsk)
6	{	7	{