diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-27 19:28:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 21:03:14 -0400 |
commit | e9a07afd9e7507ac02349b2ff59c579686dcd0fd (patch) | |
tree | 9059a443aa00f4525d424afd46d9ec9cc1fe31fa /sound/pcmcia/vx | |
parent | 11d28a30219671607a235a518f395659599a748e (diff) |
[PATCH] pcmcia: id_table for vxpocket.c
Add pcmcia_device_id table.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/pcmcia/vx')
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index fce2ad04fd8..5f4c1326415 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -18,17 +18,6 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | ||
22 | please add the following as /etc/pcmcia/vxpocket.conf: | ||
23 | |||
24 | device "snd-vxpocket" | ||
25 | class "audio" module "snd-vxpocket" | ||
26 | |||
27 | card "Digigram VX-POCKET" | ||
28 | manfid 0x01f1, 0x0100 | ||
29 | bind "snd-vxpocket" | ||
30 | |||
31 | */ | ||
32 | 21 | ||
33 | #include <sound/driver.h> | 22 | #include <sound/driver.h> |
34 | #include <linux/init.h> | 23 | #include <linux/init.h> |
@@ -140,13 +129,20 @@ static void vxp_detach(dev_link_t *link) | |||
140 | * Module entry points | 129 | * Module entry points |
141 | */ | 130 | */ |
142 | 131 | ||
132 | static struct pcmcia_device_id vxp_ids[] = { | ||
133 | PCMCIA_DEVICE_MANF_CARD(0x01f1, 0x0100), | ||
134 | PCMCIA_DEVICE_NULL | ||
135 | }; | ||
136 | MODULE_DEVICE_TABLE(pcmcia, vxp_ids); | ||
137 | |||
143 | static struct pcmcia_driver vxp_cs_driver = { | 138 | static struct pcmcia_driver vxp_cs_driver = { |
144 | .owner = THIS_MODULE, | 139 | .owner = THIS_MODULE, |
145 | .drv = { | 140 | .drv = { |
146 | .name = DEV_INFO, | 141 | .name = DEV_INFO, |
147 | }, | 142 | }, |
148 | .attach = vxp_attach, | 143 | .attach = vxp_attach, |
149 | .detach = vxp_detach | 144 | .detach = vxp_detach, |
145 | .id_table = vxp_ids, | ||
150 | }; | 146 | }; |
151 | 147 | ||
152 | static int __init init_vxpocket(void) | 148 | static int __init init_vxpocket(void) |