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

Commit f9e6bfa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

parents 1a324727 e7e37ee9

drivers/char/agp/amd64-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data 
}





static struct aper_size_info_32 uli_sizes[7] =

static const struct aper_size_info_32 uli_sizes[7] =

{

	{256, 65536, 6, 10},

	{128, 32768, 5, 9},
@@ -470,7 +470,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) 
}





static struct aper_size_info_32 nforce3_sizes[5] =

static const struct aper_size_info_32 nforce3_sizes[5] =

{

	{512,  131072, 7, 0x00000000 },

	{256,  65536,  6, 0x00000008 },

drivers/char/agp/backend.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void agp_backend_release(struct agp_bridge_data *bridge) 
EXPORT_SYMBOL(agp_backend_release);





static struct { int mem, agp; } maxes_table[] = {

static const struct { int mem, agp; } maxes_table[] = {

	{0, 0},

	{32, 4},

	{64, 28},

drivers/char/agp/via-agp.c

+6 −0
Original line number Diff line number Diff line
@@ -371,6 +371,11 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = 
		.device_id	= PCI_DEVICE_ID_VIA_3296_0,

		.chipset_name	= "P4M800",

	},

	/* P4M800CE */

	{

		.device_id	= PCI_DEVICE_ID_VIA_P4M800CE,

		.chipset_name	= "P4M800CE",

	},



	{ }, /* dummy final entry, always present */

};
@@ -511,6 +516,7 @@ static struct pci_device_id agp_via_pci_table[] = { 
	ID(PCI_DEVICE_ID_VIA_3269_0),

	ID(PCI_DEVICE_ID_VIA_83_87XX_1),

	ID(PCI_DEVICE_ID_VIA_3296_0),

	ID(PCI_DEVICE_ID_VIA_P4M800CE),

	{ }

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ 
#define PCI_DEVICE_ID_VIA_3269_0	0x0269

#define PCI_DEVICE_ID_VIA_K8T800PRO_0	0x0282

#define PCI_DEVICE_ID_VIA_8363_0	0x0305

#define PCI_DEVICE_ID_VIA_P4M800CE	0x0314

#define PCI_DEVICE_ID_VIA_8371_0	0x0391

#define PCI_DEVICE_ID_VIA_8501_0	0x0501

#define PCI_DEVICE_ID_VIA_82C561	0x0561