summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 13:12:53 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 13:12:53 +0100
commitc20efe0c1ea65ef0beb74815ab615993629d4b4d (patch)
treea9012fe40ccc7ce5b31334c9b4a22ca9fe817dd7 /sound
parenta39240835e5afe2d5d94b27436dcda86cece94cb (diff)
parenta0a99b227da57f81319dd239bc4de811b0f530ec (diff)
Merge branch 'timers/hrtimers' into auto-timers-next
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/pcsp/pcsp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 1899cf0685bc..8e52b2a8a13a 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -96,7 +96,6 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
return -EINVAL;
hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- pcsp_chip.timer.cb_mode = HRTIMER_CB_SOFTIRQ;
pcsp_chip.timer.function = pcsp_do_timer;
card = snd_card_new(index, id, THIS_MODULE, 0);