← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid

« back to all changes in this revision

Viewing changes to setup/Linux/oss/build/pci_wrapper.inc

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL, Sebastien NOEL, Benda Xu
  • Date: 2014-10-23 22:47:56 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20141023224756-ugge2zw3qib5ldip
Tags: 4.2-build2010-1
http://bugs.debian.org/696751
http://bugs.debian.org/761783
[ Sebastien NOEL ]
* New upstream release.
  - fix build with recent kernel. (Closes: #696751)
* Add build dependency on libtool-bin. (Closes: #761783)

[ Benda Xu ]
* Use debhelper 9.
* Bump to standard 3.9.6.
* Add Benda Xu to uploaders.
* Run wrap-and-sort.
* Canonicalize Vcs-Svn field and add Vcs-Browser field.
* Get rid of limits.h copy hack, leverage include-fixed from gcc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup/Linux/oss/build/pci_wrapper.inc
17
17
static dev_map_t dev_map[MAX_INSTANCE];
18
18
static int n_devmap = 0;
19
19
 
20
 
static int __devinit
 
20
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
 
21
 static int __devinit
 
22
#else
 
23
 static int
 
24
#endif
21
25
osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid)
22
26
{
23
27
  oss_device_t *osdev;
65
69
  return 0;
66
70
}
67
71
 
68
 
static void __devexit
 
72
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
 
73
 static int __devexit
 
74
#else
 
75
 static int
 
76
#endif
69
77
osspci_remove (struct pci_dev *pcidev)
70
78
{
71
79
  int i;
80
88
        pci_disable_device (dev_map[i].pcidev);
81
89
        osdev_delete (osdev);
82
90
 
83
 
        return;
 
91
        return 0;
84
92
      }
85
93
 
86
94
  printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
 
95
  return -EIO;
87
96
}
88
97
 
89
98
void