diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /sound/pci/intel8x0.c | |
| parent | Merge with temp tree to get David's gdb inferior calls patch (diff) | |
| parent | [PATCH] update ppc64 defconfig (diff) | |
| download | linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index d143d2c78988..8b33b12fa5dc 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -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 @@ -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" }, |