diff options
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/pcsp/pcsp.c | 2 | ||||
-rw-r--r-- | sound/drivers/pcsp/pcsp_lib.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 34477286b394..264d2a56dcd2 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c | |||
@@ -11,9 +11,7 @@ | |||
11 | #include <sound/core.h> | 11 | #include <sound/core.h> |
12 | #include <sound/initval.h> | 12 | #include <sound/initval.h> |
13 | #include <sound/pcm.h> | 13 | #include <sound/pcm.h> |
14 | |||
15 | #include <linux/input.h> | 14 | #include <linux/input.h> |
16 | #include <linux/delay.h> | ||
17 | #include <asm/bitops.h> | 15 | #include <asm/bitops.h> |
18 | #include "pcsp_input.h" | 16 | #include "pcsp_input.h" |
19 | #include "pcsp.h" | 17 | #include "pcsp.h" |
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index 6bdcb89129d8..a302756eac7c 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c | |||
@@ -9,10 +9,8 @@ | |||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/moduleparam.h> | 10 | #include <linux/moduleparam.h> |
11 | #include <sound/pcm.h> | 11 | #include <sound/pcm.h> |
12 | #include <sound/pcm_params.h> | ||
13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
15 | #include <asm/i8253.h> | ||
16 | #include "pcsp.h" | 14 | #include "pcsp.h" |
17 | 15 | ||
18 | static int nforce_wa; | 16 | static int nforce_wa; |
@@ -45,7 +43,7 @@ static void pcsp_start_timer(unsigned long dummy) | |||
45 | * The only solution I could find was to move the | 43 | * The only solution I could find was to move the |
46 | * hrtimer_start() into a tasklet. -stsp | 44 | * hrtimer_start() into a tasklet. -stsp |
47 | */ | 45 | */ |
48 | DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0); | 46 | static DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0); |
49 | 47 | ||
50 | enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) | 48 | enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) |
51 | { | 49 | { |