Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 965
b: refs/heads/master
c: 3437c5d
h: refs/heads/master
i:
  963: 4833e37
v: v3
  • Loading branch information
Jason Gaston authored and Linus Torvalds committed May 5, 2005
1 parent 4695533 commit d20f6f1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e422fd2c965ad1b0e4eadaabd0adb77e8a93e74e
refs/heads/master: 3437c5df6f9c00b6a9b7dcb7a30c5e3e1e5de189
6 changes: 3 additions & 3 deletions trunk/sound/pci/intel8x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c
#ifndef PCI_DEVICE_ID_INTEL_ICH7_20
#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
#endif
#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
#define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698
#ifndef PCI_DEVICE_ID_INTEL_ESB2_14
#define PCI_DEVICE_ID_INTEL_ESB2_14 0x2698
#endif
#ifndef PCI_DEVICE_ID_SI_7012
#define PCI_DEVICE_ID_SI_7012 0x7012
Expand Down Expand Up @@ -2741,7 +2741,7 @@ static struct shortname_table {
{ PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
{ PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
{ PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
{ PCI_DEVICE_ID_INTEL_ESB2_13, "Intel ESB2" },
{ PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" },
{ PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
{ PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
Expand Down

0 comments on commit d20f6f1

Please sign in to comment.