[BK PATCHES] 2.4.x misc updates

From: Jeff Garzik (jgarzik_at_pobox.com)
Date: 08/31/04

Next message: Arjan van de Ven: "Re: MAX_NESTED_LINKS"

Previous message: Helge Hafting: "Re: Linux Incompatibility List"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Date:	Tue, 31 Aug 2004 03:28:31 -0400
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>

Please do a

bk pull bk://gkernel.bkbits.net/misc-2.4

This will update the following files:

drivers/sound/ac97_codec.c | 1 +
drivers/sound/i810_audio.c | 8 ++++++++
include/linux/pci_ids.h | 4 ++++
3 files changed, 13 insertions(+)

through these ChangeSets:

<achew@nvidia.com> (04/08/31 1.1550)
[PATCH] i810_audio.c and pci_ids.h: add support for nforce MCP2S,

<ileong@nvidia.com> (04/08/28 1.1549)
[ac97_codec] add new codec

diff -Nru a/drivers/sound/ac97_codec.c b/drivers/sound/ac97_codec.c
--- a/drivers/sound/ac97_codec.c 2004-08-31 03:27:52 -04:00
+++ b/drivers/sound/ac97_codec.c 2004-08-31 03:27:52 -04:00
@@ -155,6 +155,7 @@
         {0x43525931, "Cirrus Logic CS4299 rev A", &crystal_digital_ops},
         {0x43525933, "Cirrus Logic CS4299 rev C", &crystal_digital_ops},
         {0x43525934, "Cirrus Logic CS4299 rev D", &crystal_digital_ops},
+ {0x43585430, "CXT48", &default_ops, AC97_DELUDED_MODEM },
         {0x43585442, "CXT66", &default_ops, AC97_DELUDED_MODEM },
         {0x44543031, "Diamond Technology DT0893", &default_ops},
         {0x45838308, "ESS Allegro ES1988", &null_ops},
diff -Nru a/drivers/sound/i810_audio.c b/drivers/sound/i810_audio.c
--- a/drivers/sound/i810_audio.c 2004-08-31 03:27:52 -04:00
+++ b/drivers/sound/i810_audio.c 2004-08-31 03:27:52 -04:00
@@ -304,6 +304,14 @@
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
         {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP2S_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP04_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
         {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_OPUS_7445,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD768},
         {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_AUDIO,
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h 2004-08-31 03:27:52 -04:00
+++ b/include/linux/pci_ids.h 2004-08-31 03:27:52 -04:00
@@ -981,13 +981,16 @@
#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
+#define PCI_DEVICE_ID_NVIDIA_MCP04_AUDIO 0x003a
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2 0x003e
#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE 0x0053
#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054
#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2 0x0055
+#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059
#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065
#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085
+#define PCI_DEVICE_ID_NVIDIA_MCP2S_AUDIO 0x008a
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA 0x008e
#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0
#define PCI_DEVICE_ID_NVIDIA_NFORCE3 0x00d1
@@ -996,6 +999,7 @@
#define PCI_DEVICE_ID_NVIDIA_NFORCE3S 0x00e1
#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA 0x00e3
#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE 0x00e5
+#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO 0x00ea
#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2 0x00ee
#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR 0x0100
#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR 0x0101
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Arjan van de Ven: "Re: MAX_NESTED_LINKS"

Previous message: Helge Hafting: "Re: Linux Incompatibility List"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Relevant Pages

Re: [2.6.16rc2] compile error
... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ... Copyright 2006 by Maurice Eugene Heskett, ...
(Linux-Kernel)
Re: [patch 0/14] s3c2412/s3c2413 support
... implementations. ... To unsubscribe from this list: ... Please read the FAQ at http://www.tux.org/lkml/ ... More majordomo info at http://vger.kernel.org/majordomo-info.html ...
(Linux-Kernel)
Re: Fwd: Registration Weakness in Linux Kernels Binary formats
... Subject: Registration Weakness in Linux Kernel's Binary formats To: ... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ - To unsubscribe ...
(Linux-Kernel)
Re: Suspend to RAM generates oops and general protection fault
... he said it looked like a CPU hotplug ... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
(Linux-Kernel)
Re: potential security issue
... Please provide me with a PGP key. ... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
(Linux-Kernel)