Merge /spare/repo/linux-2.6/

1 files changed, 8 insertions, 1 deletions

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index f72c81cc9952..2d4f8e28478b 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -380,13 +380,20 @@ static int pdacf_event(event_t event, int priority, event_callback_args_t *args)
 /*
  * Module entry points
  */
+static struct pcmcia_device_id snd_pdacf_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45),
+        PCMCIA_DEVICE_NULL
+};
+MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
+
 static struct pcmcia_driver pdacf_cs_driver = {
         .owner          = THIS_MODULE,
         .drv            = {
                 .name   = "snd-pdaudiocf",
         },
         .attach         = snd_pdacf_attach,
-        .detach         = snd_pdacf_detach
+        .detach         = snd_pdacf_detach,
+        .id_table       = snd_pdacf_ids,
 };
 
 static int __init init_pdacf(void)