aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/mixart/mixart.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 21:26:54 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 21:26:54 +0200
commit61441d066d8f7691ad3d9afdf1d3ae94a478c057 (patch)
tree0876449595bcdb6b05e0393805fc170598b65d03 /sound/pci/mixart/mixart.c
parentde04df3a2555ac04d19c3ad6528503d5bf4ab0e7 (diff)
downloadkernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.zip
kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.gz
kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.bz2
remove compat from include, get new scripts working
further update code, especially sound remove initramfs files for galaxys2 and d710 and a busybox binary
Diffstat (limited to 'sound/pci/mixart/mixart.c')
-rw-r--r--sound/pci/mixart/mixart.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 6c3fd4d..a0bd1d9 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -25,7 +25,7 @@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/slab.h>
@@ -1268,7 +1268,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
}
if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
- CARD_NAME, mgr)) {
+ KBUILD_MODNAME, mgr)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr);
return -EBUSY;
@@ -1381,7 +1381,7 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
- .name = "Digigram miXart",
+ .name = KBUILD_MODNAME,
.id_table = snd_mixart_ids,
.probe = snd_mixart_probe,
.remove = __devexit_p(snd_mixart_remove),