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
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
sound
/
ymfpci.h
diff --git
a/include/sound/ymfpci.h
b/include/sound/ymfpci.h
index
1f4db1d
..
b874533
100644
(file)
--- a/
include/sound/ymfpci.h
+++ b/
include/sound/ymfpci.h
@@
-305,7
+305,7
@@
struct _snd_ymfpci {
unsigned int device_id; /* PCI device ID */
unsigned int rev; /* PCI revision */
unsigned long reg_area_phys;
unsigned int device_id; /* PCI device ID */
unsigned int rev; /* PCI revision */
unsigned long reg_area_phys;
-
unsigned long
reg_area_virt;
+
void __iomem *
reg_area_virt;
struct resource *res_reg_area;
struct resource *fm_res;
struct resource *mpu_res;
struct resource *res_reg_area;
struct resource *fm_res;
struct resource *mpu_res;
@@
-389,9
+389,6
@@
int snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t **rpcm);
int snd_ymfpci_mixer(ymfpci_t *chip, int rear_switch);
int snd_ymfpci_timer(ymfpci_t *chip, int device);
int snd_ymfpci_mixer(ymfpci_t *chip, int rear_switch);
int snd_ymfpci_timer(ymfpci_t *chip, int device);
-int snd_ymfpci_voice_alloc(ymfpci_t *chip, ymfpci_voice_type_t type, int pair, ymfpci_voice_t **rvoice);
-int snd_ymfpci_voice_free(ymfpci_t *chip, ymfpci_voice_t *pvoice);
-
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
#define SUPPORT_JOYSTICK
#endif
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
#define SUPPORT_JOYSTICK
#endif