diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/gameport.h | 3 | ||||
-rw-r--r-- | include/linux/serio.h | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 0cd825f7363a..1bc08541c2b9 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
14 | #include <linux/types.h> | ||
14 | #include <linux/list.h> | 15 | #include <linux/list.h> |
15 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
16 | #include <linux/device.h> | 17 | #include <linux/device.h> |
@@ -62,7 +63,7 @@ struct gameport_driver { | |||
62 | 63 | ||
63 | struct device_driver driver; | 64 | struct device_driver driver; |
64 | 65 | ||
65 | unsigned int ignore; | 66 | bool ignore; |
66 | }; | 67 | }; |
67 | #define to_gameport_driver(d) container_of(d, struct gameport_driver, driver) | 68 | #define to_gameport_driver(d) container_of(d, struct gameport_driver, driver) |
68 | 69 | ||
diff --git a/include/linux/serio.h b/include/linux/serio.h index e0417e4d3f15..126d24c9eaa8 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
17 | 17 | ||
18 | #include <linux/types.h> | ||
18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
19 | #include <linux/list.h> | 20 | #include <linux/list.h> |
20 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
@@ -28,7 +29,10 @@ struct serio { | |||
28 | char name[32]; | 29 | char name[32]; |
29 | char phys[32]; | 30 | char phys[32]; |
30 | 31 | ||
31 | unsigned int manual_bind; | 32 | bool manual_bind; |
33 | bool registered; /* port has been fully registered with driver core */ | ||
34 | bool suspended; /* port is suspended */ | ||
35 | |||
32 | 36 | ||
33 | struct serio_device_id id; | 37 | struct serio_device_id id; |
34 | 38 | ||
@@ -47,7 +51,6 @@ struct serio { | |||
47 | struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */ | 51 | struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */ |
48 | 52 | ||
49 | struct device dev; | 53 | struct device dev; |
50 | unsigned int registered; /* port has been fully registered with driver core */ | ||
51 | 54 | ||
52 | struct list_head node; | 55 | struct list_head node; |
53 | }; | 56 | }; |
@@ -58,7 +61,7 @@ struct serio_driver { | |||
58 | char *description; | 61 | char *description; |
59 | 62 | ||
60 | struct serio_device_id *id_table; | 63 | struct serio_device_id *id_table; |
61 | unsigned int manual_bind; | 64 | bool manual_bind; |
62 | 65 | ||
63 | void (*write_wakeup)(struct serio *); | 66 | void (*write_wakeup)(struct serio *); |
64 | irqreturn_t (*interrupt)(struct serio *, unsigned char, unsigned int); | 67 | irqreturn_t (*interrupt)(struct serio *, unsigned char, unsigned int); |