diff for duplicates of <1084577358220@kroah.com> diff --git a/a/1.txt b/N1/1.txt index a675687..b94b30f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,10 +62,10 @@ diff -Nru a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c @@ -121,7 +122,8 @@ I801_dev = dev; - if ((dev->device = PCI_DEVICE_ID_INTEL_82801DB_3) || -- (dev->device = PCI_DEVICE_ID_INTEL_82801EB_3)) -+ (dev->device = PCI_DEVICE_ID_INTEL_82801EB_3) || -+ (dev->device = PCI_DEVICE_ID_INTEL_ESB_4)) + if ((dev->device == PCI_DEVICE_ID_INTEL_82801DB_3) || +- (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3)) ++ (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3) || ++ (dev->device == PCI_DEVICE_ID_INTEL_ESB_4)) isich4 = 1; else isich4 = 0; @@ -211,18 +211,18 @@ diff -Nru a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c @@ -2797,7 +2797,7 @@ /* see i810_ac97_init for the next 7 lines (jsaw) */ inw(card->ac97base); - if ((card->pci_id = PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH5 || -- card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_3) -+ card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_18) + if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 || +- card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3) ++ card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18) && (card->use_mmio)) { primary_codec_id = (int) readl(card->iobase_mmio + SDM) & 0x3; printk(KERN_INFO "i810_audio: Primary codec has ID %d\n", @@ -2868,7 +2868,7 @@ last codec ID spoken to. */ - if ((card->pci_id = PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH5 || -- card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_3) -+ card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_18) + if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 || +- card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3) ++ card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18) && (card->use_mmio)) { ac97_id = (int) readl(card->iobase_mmio + SDM) & 0x3; printk(KERN_INFO "i810_audio: Connection %d with codec id %d\n", diff --git a/a/content_digest b/N1/content_digest index 92a663b..7b22599 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010845773582039@kroah.com\0" - "ref\010845773562431@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C update for 2.6.6\0" - "Date\0Thu, 19 May 2005 06:24:58 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C update for 2.6.6\0" + "Date\0Fri, 14 May 2004 16:29:18 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -71,10 +70,10 @@ "@@ -121,7 +122,8 @@\n" " \n" " \tI801_dev = dev;\n" - " \tif ((dev->device = PCI_DEVICE_ID_INTEL_82801DB_3) ||\n" - "-\t (dev->device = PCI_DEVICE_ID_INTEL_82801EB_3))\n" - "+\t (dev->device = PCI_DEVICE_ID_INTEL_82801EB_3) ||\n" - "+\t (dev->device = PCI_DEVICE_ID_INTEL_ESB_4))\n" + " \tif ((dev->device == PCI_DEVICE_ID_INTEL_82801DB_3) ||\n" + "-\t (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3))\n" + "+\t (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3) ||\n" + "+\t (dev->device == PCI_DEVICE_ID_INTEL_ESB_4))\n" " \t\tisich4 = 1;\n" " \telse\n" " \t\tisich4 = 0;\n" @@ -220,20 +219,20 @@ "@@ -2797,7 +2797,7 @@\n" " \t/* see i810_ac97_init for the next 7 lines (jsaw) */\n" " \tinw(card->ac97base);\n" - " \tif ((card->pci_id = PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH5 ||\n" - "-\t card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_3)\n" - "+\t card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_18)\n" + " \tif ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 ||\n" + "-\t card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3)\n" + "+\t card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18)\n" " \t && (card->use_mmio)) {\n" " \t\tprimary_codec_id = (int) readl(card->iobase_mmio + SDM) & 0x3;\n" " \t\tprintk(KERN_INFO \"i810_audio: Primary codec has ID %d\\n\",\n" "@@ -2868,7 +2868,7 @@\n" " \t\t last codec ID spoken to. \n" " \t\t*/\n" - " \t\tif ((card->pci_id = PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH5 ||\n" - "-\t\t card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_3)\n" - "+\t\t card->pci_id = PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id = PCI_DEVICE_ID_INTEL_ICH6_18)\n" + " \t\tif ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 ||\n" + "-\t\t card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3)\n" + "+\t\t card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18)\n" " \t\t && (card->use_mmio)) {\n" " \t\t\tac97_id = (int) readl(card->iobase_mmio + SDM) & 0x3;\n" " \t\t\tprintk(KERN_INFO \"i810_audio: Connection %d with codec id %d\\n\"," -824ebab86fa2dd14532ade9af9eb3d2fc91362f40705784c9ef00f63ab3296a7 +67d8d16d85eb663459097718368f9624405ce497a8598d4d52ded5a85eb44538
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.