Merge branch 'fix/pci-vdevice' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 29 Jun 2009 16:05:09 +0000 (18:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 29 Jun 2009 16:05:09 +0000 (18:05 +0200)
commit580c9d373ce7ccfbc5227e985fca761f8f039af3
tree4de132f09624dd2cafc51fcd3171e41494adef64
parente2cb0d95ba9fbd4603375032d37e9c0e288897b8
parent0d7392e54435476243ce08ba57745ab52d639cbb
Merge branch 'fix/pci-vdevice' into for-linus

* fix/pci-vdevice:
  sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
  sound: Use PCI_VDEVICE