diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /sound/pci/rme9652/hdspm.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/pci/rme9652/hdspm.c')
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 7d03ae066d53..7055d893855d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
| @@ -2556,8 +2556,7 @@ static int snd_hdspm_set_defaults(struct hdspm * hdspm) | |||
| 2556 | interupt | 2556 | interupt |
| 2557 | ------------------------------------------------------------*/ | 2557 | ------------------------------------------------------------*/ |
| 2558 | 2558 | ||
| 2559 | static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id, | 2559 | static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id) |
| 2560 | struct pt_regs *regs) | ||
| 2561 | { | 2560 | { |
| 2562 | struct hdspm *hdspm = (struct hdspm *) dev_id; | 2561 | struct hdspm *hdspm = (struct hdspm *) dev_id; |
| 2563 | unsigned int status; | 2562 | unsigned int status; |