iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] fix compile errors
This commit is contained in:
Linus Torvalds 2007-02-27 07:45:09 -08:00
commit d3dcc2cb2c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/agp/hp-agp.c
View File

@ -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,

2
drivers/char/agp/i460-agp.c
View File

@ -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,

2
drivers/char/agp/sgi-agp.c
View File

@ -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,

4
drivers/char/agp/uninorth-agp.c
View File

@ -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,