summaryrefslogtreecommitdiff
path: root/sound/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-06-27 16:28:33 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:03:14 -0700
commite9a07afd9e7507ac02349b2ff59c579686dcd0fd (patch)
tree9059a443aa00f4525d424afd46d9ec9cc1fe31fa /sound/pcmcia
parent11d28a30219671607a235a518f395659599a748e (diff)
downloadlinux-3.10-e9a07afd9e7507ac02349b2ff59c579686dcd0fd.tar.gz
linux-3.10-e9a07afd9e7507ac02349b2ff59c579686dcd0fd.tar.bz2
linux-3.10-e9a07afd9e7507ac02349b2ff59c579686dcd0fd.zip
[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')
-rw-r--r--sound/pcmcia/vx/vxpocket.c20
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 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*
- please add the following as /etc/pcmcia/vxpocket.conf:
-
- device "snd-vxpocket"
- class "audio" module "snd-vxpocket"
-
- card "Digigram VX-POCKET"
- manfid 0x01f1, 0x0100
- bind "snd-vxpocket"
-
- */
#include <sound/driver.h>
#include <linux/init.h>
@@ -140,13 +129,20 @@ static void vxp_detach(dev_link_t *link)
* Module entry points
*/
+static struct pcmcia_device_id vxp_ids[] = {
+ PCMCIA_DEVICE_MANF_CARD(0x01f1, 0x0100),
+ PCMCIA_DEVICE_NULL
+};
+MODULE_DEVICE_TABLE(pcmcia, vxp_ids);
+
static struct pcmcia_driver vxp_cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = DEV_INFO,
},
.attach = vxp_attach,
- .detach = vxp_detach
+ .detach = vxp_detach,
+ .id_table = vxp_ids,
};
static int __init init_vxpocket(void)