← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to sound/pci/als4000.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/pci/als4000.c
69
69
#include <linux/init.h>
70
70
#include <linux/pci.h>
71
71
#include <linux/gameport.h>
72
 
#include <linux/moduleparam.h>
 
72
#include <linux/module.h>
73
73
#include <linux/dma-mapping.h>
74
74
#include <sound/core.h>
75
75
#include <sound/pcm.h>
931
931
 
932
932
        if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
933
933
                                        iobase + ALS4K_IOB_30_MIDI_DATA,
934
 
                                        MPU401_INFO_INTEGRATED,
935
 
                                        pci->irq, 0, &chip->rmidi)) < 0) {
 
934
                                        MPU401_INFO_INTEGRATED |
 
935
                                        MPU401_INFO_IRQ_HOOK,
 
936
                                        -1, &chip->rmidi)) < 0) {
936
937
                printk(KERN_ERR "als4000: no MPU-401 device at 0x%lx?\n",
937
938
                                iobase + ALS4K_IOB_30_MIDI_DATA);
938
939
                goto out_err;
1036
1037
 
1037
1038
 
1038
1039
static struct pci_driver driver = {
1039
 
        .name = "ALS4000",
 
1040
        .name = KBUILD_MODNAME,
1040
1041
        .id_table = snd_als4000_ids,
1041
1042
        .probe = snd_card_als4000_probe,
1042
1043
        .remove = __devexit_p(snd_card_als4000_remove),