← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to include/pci_ids_compat.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 16:28:58 UTC
  • mfrom: (1.1.12 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104162858-7ky0tu33d7mn6oys
Tags: 1.0.21+dfsg-3ubuntu1
* Merge from debian unstable, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/pci_ids_compat.h
304
304
#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1
305
305
#define PCI_DEVICE_ID_CREATIVE_EMU10K1  0x0002
306
306
#endif
 
307
#ifndef PCI_DEVICE_ID_CREATIVE_20K1
 
308
#define PCI_DEVICE_ID_CREATIVE_20K1     0x0005
 
309
#define PCI_DEVICE_ID_CREATIVE_20K2     0x000b
 
310
#define PCI_SUBDEVICE_ID_CREATIVE_SB0760        0x0024
 
311
#define PCI_SUBDEVICE_ID_CREATIVE_SB08801       0x0041
 
312
#define PCI_SUBDEVICE_ID_CREATIVE_SB08802       0x0042
 
313
#define PCI_SUBDEVICE_ID_CREATIVE_SB08803       0x0043
 
314
#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX       0x6000
 
315
#endif
307
316
 
308
317
/* ice1712 */
309
318
#ifndef PCI_VENDOR_ID_ICE
399
408
#ifndef PCI_VENDOR_ID_DFI
400
409
#define PCI_VENDOR_ID_DFI               0x15bd
401
410
#endif
 
411
 
 
412
#ifndef PCI_DEVICE_ID_ATI_SBX00_SMBUS
 
413
#define PCI_DEVICE_ID_ATI_SBX00_SMBUS   0x4385
 
414
#endif