summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2004-07-28 15:44:34 +0200
committerJaroslav Kysela <perex@suse.cz>2004-07-28 15:44:34 +0200
commiteae107890cada0bfb780c55ebe630388abec972e (patch)
treebc173e0f2a8c49a28eedfa9049042546b6691060 /include/sound
parentf3817f00087c46265a7d0c540b0f5523502f57f4 (diff)
ALSA CVS update
EMU10K1/EMU10K2 driver,Trident driver,ALS4000 driver,ATIIXP driver ATIIXP-modem driver,AZT3328 driver,BT87x driver,CMIPCI driver CS4281 driver,ENS1370/1+ driver,ES1938 driver,ES1968 driver FM801 driver,Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver RME32 driver,RME96 driver,SonicVibes driver,VIA82xx driver ALI5451 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver MIXART driver,RME HDSP driver,RME9652 driver,Digigram VX222 driver Clean up the PCI resource allocation. Replaced the manual resource allocations with request_[mem_]region() with pci_request_regions(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/emu10k1.h1
-rw-r--r--include/sound/trident.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 91d1cf89b735..15c16e5bd0ee 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -933,7 +933,6 @@ struct _snd_emu10k1 {
int irq;
unsigned long port; /* I/O port number */
- struct resource *res_port;
int APS: 1, /* APS flag */
no_ac97: 1, /* no AC'97 */
tos_link: 1, /* tos link detected */
diff --git a/include/sound/trident.h b/include/sound/trident.h
index 255a5cbe6016..7538ba6b35fe 100644
--- a/include/sound/trident.h
+++ b/include/sound/trident.h
@@ -398,7 +398,6 @@ struct _snd_trident {
unsigned char bDMAStart;
unsigned long port;
- struct resource *res_port;
unsigned long midi_port;
unsigned int spurious_irq_count;