Merge by hand (conflicts in sr.c)

[linux-2.6] / include / sound / ac97_codec.h

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 996eeab683b0335d786f6b3b185f9cce8a8e1f81..1309c12b8f71274faf024a944a8244abf17ed5e3 100644 (file)
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -573,8 +573,8 @@ enum {
 };
 
 struct ac97_quirk {
-       unsigned short vendor;  /* PCI vendor id */
-       unsigned short device;  /* PCI device id */
+       unsigned short subvendor; /* PCI subsystem vendor id */
+       unsigned short subdevice; /* PCI sybsystem device id */
        unsigned short mask;    /* device id bit mask, 0 = accept all */
        unsigned int codec_id;  /* codec id (if any), 0 = accept all */
        const char *name;       /* name shown as info */