diff options
Diffstat (limited to 'openvz-sources/022.064/5114_linux-2.6.8.1-intel-ich7-esb2.patch')
| -rw-r--r-- | openvz-sources/022.064/5114_linux-2.6.8.1-intel-ich7-esb2.patch | 173 |
1 files changed, 0 insertions, 173 deletions
diff --git a/openvz-sources/022.064/5114_linux-2.6.8.1-intel-ich7-esb2.patch b/openvz-sources/022.064/5114_linux-2.6.8.1-intel-ich7-esb2.patch deleted file mode 100644 index a919c15..0000000 --- a/openvz-sources/022.064/5114_linux-2.6.8.1-intel-ich7-esb2.patch +++ /dev/null @@ -1,173 +0,0 @@ ---- ./arch/i386/pci/irq.c.INTEL 2004-08-14 14:56:24.000000000 +0400 -+++ ./arch/i386/pci/irq.c 2005-10-28 15:09:08.067981872 +0400 -@@ -481,6 +481,11 @@ static __init int intel_router_probe(str - case PCI_DEVICE_ID_INTEL_ESB_1: - case PCI_DEVICE_ID_INTEL_ICH6_0: - case PCI_DEVICE_ID_INTEL_ICH6_1: -+ case PCI_DEVICE_ID_INTEL_ICH7_0: -+ case PCI_DEVICE_ID_INTEL_ICH7_1: -+ case PCI_DEVICE_ID_INTEL_ICH7_30: -+ case PCI_DEVICE_ID_INTEL_ICH7_31: -+ case PCI_DEVICE_ID_INTEL_ESB2_0: - r->name = "PIIX/ICH"; - r->get = pirq_piix_get; - r->set = pirq_piix_set; ---- ./drivers/i2c/busses/Kconfig.INTEL 2004-08-14 14:56:00.000000000 +0400 -+++ ./drivers/i2c/busses/Kconfig 2005-10-28 15:09:08.074980808 +0400 -@@ -97,6 +97,8 @@ config I2C_I801 - 82801EB - 6300ESB - ICH6 -+ ICH7 -+ ESB2 - - This driver can also be built as a module. If so, the module - will be called i2c-i801. ---- ./drivers/i2c/busses/i2c-i801.c.INTEL 2004-08-14 14:55:32.000000000 +0400 -+++ ./drivers/i2c/busses/i2c-i801.c 2005-10-28 15:09:08.073980960 +0400 -@@ -30,6 +30,8 @@ - 82801EB 24D3 (HW PEC supported, 32 byte buffer not supported) - 6300ESB 25A4 - ICH6 266A -+ ICH7 27DA -+ ESB2 269B - This driver supports several versions of Intel's I/O Controller Hubs (ICH). - For SMBus support, they are similar to the PIIX4 and are part - of Intel's '810' and other chipsets. -@@ -596,6 +598,18 @@ static struct pci_device_id i801_ids[] = - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, -+ { -+ .vendor = PCI_VENDOR_ID_INTEL, -+ .device = PCI_DEVICE_ID_INTEL_ICH7_17, -+ .subvendor = PCI_ANY_ID, -+ .subdevice = PCI_ANY_ID, -+ }, -+ { -+ .vendor = PCI_VENDOR_ID_INTEL, -+ .device = PCI_DEVICE_ID_INTEL_ESB2_17, -+ .subvendor = PCI_ANY_ID, -+ .subdevice = PCI_ANY_ID, -+ }, - { 0, } - }; - ---- ./drivers/ide/pci/piix.c.INTEL 2004-08-14 14:54:48.000000000 +0400 -+++ ./drivers/ide/pci/piix.c 2005-10-28 15:09:08.073980960 +0400 -@@ -154,6 +154,8 @@ static int piix_get_info (char *buffer, - case PCI_DEVICE_ID_INTEL_82801E_11: - case PCI_DEVICE_ID_INTEL_ESB_2: - case PCI_DEVICE_ID_INTEL_ICH6_19: -+ case PCI_DEVICE_ID_INTEL_ICH7_21: -+ case PCI_DEVICE_ID_INTEL_ESB2_18: - p += sprintf(p, "PIIX4 Ultra 100 "); - break; - case PCI_DEVICE_ID_INTEL_82372FB_1: -@@ -293,6 +295,8 @@ static u8 piix_ratemask (ide_drive_t *dr - case PCI_DEVICE_ID_INTEL_82801EB_11: - case PCI_DEVICE_ID_INTEL_ESB_2: - case PCI_DEVICE_ID_INTEL_ICH6_19: -+ case PCI_DEVICE_ID_INTEL_ICH7_21: -+ case PCI_DEVICE_ID_INTEL_ESB2_18: - mode = 3; - break; - /* UDMA 66 capable */ -@@ -623,6 +627,8 @@ static unsigned int __devinit init_chips - case PCI_DEVICE_ID_INTEL_82801E_11: - case PCI_DEVICE_ID_INTEL_ESB_2: - case PCI_DEVICE_ID_INTEL_ICH6_19: -+ case PCI_DEVICE_ID_INTEL_ICH7_21: -+ case PCI_DEVICE_ID_INTEL_ESB2_18: - { - unsigned int extra = 0; - pci_read_config_dword(dev, 0x54, &extra); -@@ -798,6 +804,8 @@ static struct pci_device_id piix_pci_tbl - #endif - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19}, - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_19, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20}, -+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21}, -+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22}, - { 0, }, - }; - MODULE_DEVICE_TABLE(pci, piix_pci_tbl); ---- ./drivers/ide/pci/piix.h.INTEL 2004-08-14 14:54:51.000000000 +0400 -+++ ./drivers/ide/pci/piix.h 2005-10-28 15:09:08.072981112 +0400 -@@ -61,7 +61,9 @@ static ide_pci_device_t piix_pci_info[] - /* 17 */ DECLARE_PIIX_DEV("ICH4"), - /* 18 */ DECLARE_PIIX_DEV("ICH5-SATA"), - /* 19 */ DECLARE_PIIX_DEV("ICH5"), -- /* 20 */ DECLARE_PIIX_DEV("ICH6") -+ /* 20 */ DECLARE_PIIX_DEV("ICH6"), -+ /* 21 */ DECLARE_PIIX_DEV("ICH7"), -+ /* 22 */ DECLARE_PIIX_DEV("ESB2"), - }; - - #endif /* PIIX_H */ ---- ./drivers/pci/quirks.c.INTEL 2005-10-28 15:08:49.319832024 +0400 -+++ ./drivers/pci/quirks.c 2005-10-28 15:09:08.074980808 +0400 -@@ -887,8 +887,13 @@ static void __init quirk_intel_ide_combi - case 0x2651: - case 0x2652: - case 0x2653: -+ case 0x2680: /* ESB2 */ - ich = 6; - break; -+ case 0x27c0: -+ case 0x27c4: -+ ich = 7; -+ break; - default: - /* we do not handle this PCI device */ - return; -@@ -908,7 +913,7 @@ static void __init quirk_intel_ide_combi - else - return; /* not in combined mode */ - } else { -- WARN_ON(ich != 6); -+ WARN_ON((ich != 6) && (ich != 7)); - tmp &= 0x3; /* interesting bits 1:0 */ - if (tmp & (1 << 0)) - comb = (1 << 2); /* PATA port 0, SATA port 1 */ ---- ./sound/pci/intel8x0.c.INTEL 2004-08-14 14:55:34.000000000 +0400 -+++ ./sound/pci/intel8x0.c 2005-10-28 15:09:08.069981568 +0400 -@@ -56,6 +56,8 @@ MODULE_DEVICES("{{Intel,82801AA-ICH}," - "{Intel,82801DB-ICH4}," - "{Intel,ICH5}," - "{Intel,ICH6}," -+ "{Intel,ICH7}," -+ "{Intel,ESB2}," - "{Intel,6300ESB}," - "{Intel,MX440}," - "{SiS,SI7012}," -@@ -140,6 +142,12 @@ MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABL - #ifndef PCI_DEVICE_ID_INTEL_ICH6_3 - #define PCI_DEVICE_ID_INTEL_ICH6_3 0x266e - #endif -+#ifndef PCI_DEVICE_ID_INTEL_ICH7_20 -+#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de -+#endif -+#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 - #endif -@@ -459,6 +467,8 @@ static struct pci_device_id snd_intel8x0 - { 0x8086, 0x24d5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH5 */ - { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */ - { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */ -+ { 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */ -+ { 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */ - { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */ - { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */ - { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */ -@@ -2609,6 +2619,8 @@ static struct shortname_table { - { PCI_DEVICE_ID_INTEL_ICH5, "Intel ICH5" }, - { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" }, - { PCI_DEVICE_ID_INTEL_ICH6_3, "Intel ICH6" }, -+ { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" }, -+ { 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" }, |