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

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

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] fix compile errors
parents ce270020 e047d1cf

drivers/char/agp/hp-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ hp_zx1_enable (struct agp_bridge_data *bridge, u32 mode) 
	agp_device_command(command, (mode & AGP8X_MODE) != 0);

}



struct const agp_bridge_driver hp_zx1_driver = {

const struct agp_bridge_driver hp_zx1_driver = {

	.owner			= THIS_MODULE,

	.size_type		= FIXED_APER_SIZE,

	.configure		= hp_zx1_configure,

drivers/char/agp/i460-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static unsigned long i460_mask_memory (struct agp_bridge_data *bridge, 
		| (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xfffff000) >> 12);

}



struct const agp_bridge_driver intel_i460_driver = {

const struct agp_bridge_driver intel_i460_driver = {

	.owner			= THIS_MODULE,

	.aperture_sizes		= i460_sizes,

	.size_type		= U8_APER_SIZE,

drivers/char/agp/sgi-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct agp_bridge_data *sgi_tioca_find_bridge(struct pci_dev *pdev) 
	return bridge;

}



struct const agp_bridge_driver sgi_tioca_driver = {

const struct agp_bridge_driver sgi_tioca_driver = {

	.owner = THIS_MODULE,

	.size_type = U16_APER_SIZE,

	.configure = sgi_tioca_configure,

drivers/char/agp/uninorth-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static const struct aper_size_info_32 u3_sizes[8] = 
	{4, 1024, 0, 1}

};



struct const agp_bridge_driver uninorth_agp_driver = {

const struct agp_bridge_driver uninorth_agp_driver = {

	.owner			= THIS_MODULE,

	.aperture_sizes		= (void *)uninorth_sizes,

	.size_type		= U32_APER_SIZE,
@@ -514,7 +514,7 @@ struct const agp_bridge_driver uninorth_agp_driver = { 
	.cant_use_aperture	= 1,

};



struct const agp_bridge_driver u3_agp_driver = {

const struct agp_bridge_driver u3_agp_driver = {

	.owner			= THIS_MODULE,

	.aperture_sizes		= (void *)u3_sizes,

	.size_type		= U32_APER_SIZE,