git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
pcmcia
/
pdaudiocf
/
pdaudiocf.h
diff --git
a/sound/pcmcia/pdaudiocf/pdaudiocf.h
b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index
2744f18
..
206e2f5
100644
(file)
--- a/
sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/
sound/pcmcia/pdaudiocf/pdaudiocf.h
@@
-116,7
+116,7
@@
struct snd_pdacf {
void *pcm_area;
/* pcmcia stuff */
void *pcm_area;
/* pcmcia stuff */
-
dev_link_t link
;
+
struct pcmcia_device *p_dev
;
dev_node_t node;
};
dev_node_t node;
};
@@
-138,7
+138,7
@@
int snd_pdacf_suspend(struct snd_pdacf *chip, pm_message_t state);
int snd_pdacf_resume(struct snd_pdacf *chip);
#endif
int snd_pdacf_pcm_new(struct snd_pdacf *chip);
int snd_pdacf_resume(struct snd_pdacf *chip);
#endif
int snd_pdacf_pcm_new(struct snd_pdacf *chip);
-irqreturn_t pdacf_interrupt(int irq, void *dev
, struct pt_regs *regs
);
+irqreturn_t pdacf_interrupt(int irq, void *dev);
void pdacf_tasklet(unsigned long private_data);
void pdacf_reinit(struct snd_pdacf *chip, int resume);
void pdacf_tasklet(unsigned long private_data);
void pdacf_reinit(struct snd_pdacf *chip, int resume);