Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9119f85a authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Dave Airlie
Browse files

[intel_agp] fix name for G35 chipset 



Change origin chipset name i965G_1 to market name G35.

Signed-off-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 4d64dd9e

drivers/char/agp/intel-agp.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -14,8 +14,8 @@ 
#define PCI_DEVICE_ID_INTEL_E7221_IG	0x258a

#define PCI_DEVICE_ID_INTEL_E7221_IG	0x258a

#define PCI_DEVICE_ID_INTEL_82946GZ_HB      0x2970

#define PCI_DEVICE_ID_INTEL_82946GZ_HB      0x2970

#define PCI_DEVICE_ID_INTEL_82946GZ_IG      0x2972

#define PCI_DEVICE_ID_INTEL_82946GZ_IG      0x2972

#define PCI_DEVICE_ID_INTEL_82965G_1_HB     0x2980

#define PCI_DEVICE_ID_INTEL_82G35_HB     0x2980

#define PCI_DEVICE_ID_INTEL_82965G_1_IG     0x2982

#define PCI_DEVICE_ID_INTEL_82G35_IG     0x2982

#define PCI_DEVICE_ID_INTEL_82965Q_HB       0x2990

#define PCI_DEVICE_ID_INTEL_82965Q_HB       0x2990

#define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992

#define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992

#define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0

#define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0
@@ -36,7 +36,7 @@ 
#define PCI_DEVICE_ID_INTEL_IGD_IG          0x2A42

#define PCI_DEVICE_ID_INTEL_IGD_IG          0x2A42





#define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \

#define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82G35_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \

                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \
@@ -2049,7 +2049,7 @@ static const struct intel_driver_description { 
		NULL, &intel_915_driver },

		NULL, &intel_915_driver },

	{ PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, 0, "946GZ",

	{ PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, 0, "946GZ",

		NULL, &intel_i965_driver },

		NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_82965G_1_HB, PCI_DEVICE_ID_INTEL_82965G_1_IG, 0, "965G",

	{ PCI_DEVICE_ID_INTEL_82G35_HB, PCI_DEVICE_ID_INTEL_82G35_IG, 0, "G35",

		NULL, &intel_i965_driver },

		NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_82965Q_HB, PCI_DEVICE_ID_INTEL_82965Q_IG, 0, "965Q",

	{ PCI_DEVICE_ID_INTEL_82965Q_HB, PCI_DEVICE_ID_INTEL_82965Q_IG, 0, "965Q",

		NULL, &intel_i965_driver },

		NULL, &intel_i965_driver },
@@ -2251,7 +2251,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_82945GM_HB),

	ID(PCI_DEVICE_ID_INTEL_82945GM_HB),

	ID(PCI_DEVICE_ID_INTEL_82945GME_HB),

	ID(PCI_DEVICE_ID_INTEL_82945GME_HB),

	ID(PCI_DEVICE_ID_INTEL_82946GZ_HB),

	ID(PCI_DEVICE_ID_INTEL_82946GZ_HB),

	ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),

	ID(PCI_DEVICE_ID_INTEL_82G35_HB),

	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),

	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),

	ID(PCI_DEVICE_ID_INTEL_82965G_HB),

	ID(PCI_DEVICE_ID_INTEL_82965G_HB),

	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),

	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),