diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-27 07:45:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-27 07:45:09 -0800 |
| commit | d3dcc2cb2cd86b1db68f0d87d610f1f14406f928 (patch) | |
| tree | 683a5a59cfba1584b4f89cdd9c2f6228ffe7cfd2 | |
| parent | ce27002078e1e65c64395c0a3348786c974306cf (diff) | |
| parent | e047d1cfc3cd79f75e7dda9ffb28b456f6936864 (diff) | |
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
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 2 | ||||
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 2 | ||||
| -rw-r--r-- | drivers/char/agp/sgi-agp.c | 2 | ||||
| -rw-r--r-- | drivers/char/agp/uninorth-agp.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 79f7c01db75..bcdb149c817 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c @@ -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, diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index 1cde376a45e..53354bf83af 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c @@ -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, diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c index e12773acf3d..ee8f50edde1 100644 --- a/drivers/char/agp/sgi-agp.c +++ b/drivers/char/agp/sgi-agp.c @@ -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, diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 292b4ad1ae3..91b062126a6 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c @@ -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, |