summaryrefslogtreecommitdiff
path: root/include/linux/serio.h
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2003-02-12 12:41:07 +0100
committerVojtech Pavlik <vojtech@suse.cz>2003-02-12 12:41:07 +0100
commit7a4d842a773aced09bab3067bdde833fce49bd8a (patch)
tree7770a7da11b076377dd57373f8ef9f41356f588c /include/linux/serio.h
parentbb5cc62fe723cd7235a5320651903c453d9f8f20 (diff)
input: Get rid of the kbd_pt_regs variable, and instead pass the
value all the way from an interrupt handler to keyboard.c that can display it.
Diffstat (limited to 'include/linux/serio.h')
-rw-r--r--include/linux/serio.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 2e45f82a554d..751b0690668d 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -10,10 +10,13 @@
*/
#include <linux/ioctl.h>
-#include <linux/list.h>
#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)
+#ifdef __KERNEL__
+
+#include <linux/list.h>
+
struct serio;
struct serio {
@@ -47,7 +50,7 @@ struct serio_dev {
char *name;
void (*write_wakeup)(struct serio *);
- void (*interrupt)(struct serio *, unsigned char, unsigned int);
+ void (*interrupt)(struct serio *, unsigned char, unsigned int, struct pt_regs *);
void (*connect)(struct serio *, struct serio_dev *dev);
void (*disconnect)(struct serio *);
void (*cleanup)(struct serio *);
@@ -58,7 +61,7 @@ struct serio_dev {
int serio_open(struct serio *serio, struct serio_dev *dev);
void serio_close(struct serio *serio);
void serio_rescan(struct serio *serio);
-void serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags);
+void serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs);
void serio_register_port(struct serio *serio);
void serio_unregister_port(struct serio *serio);
@@ -85,6 +88,8 @@ static __inline__ void serio_cleanup(struct serio *serio)
serio->dev->cleanup(serio);
}
+#endif
+
/*
* bit masks for use in "interrupt" flags (3rd argument)
*/