Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[AGPGART] fix compile errors

This fixes the following compile failures of agpgart drivers.
These errors were inserted by the recent AGPGART constification patch.

drivers/char/agp/uninorth-agp.c:492: error: expected '{' before 'const'
drivers/char/agp/uninorth-agp.c:517: error: expected '{' before 'const'
drivers/char/agp/uninorth-agp.c: In function 'agp_uninorth_probe':
drivers/char/agp/uninorth-agp.c:634: error: 'u3_agp_driver' undeclared (first use in this function)
drivers/char/agp/uninorth-agp.c:634: error: (Each undeclared identifier is reported only once
drivers/char/agp/uninorth-agp.c:634: error: for each function it appears in.)
drivers/char/agp/uninorth-agp.c:636: error: 'uninorth_agp_driver' undeclared (first use in this function)

Signed-off-by: Ryusuke Konishi <ryusuke@osrg.net>
Signed-off-by: Dave Jones <davej@redhat.com>

authored by

Ryusuke Konishi and committed by
Dave Jones
e047d1cf 01363220

+5 -5
+1 -1
drivers/char/agp/hp-agp.c
··· 419 419 agp_device_command(command, (mode & AGP8X_MODE) != 0); 420 420 } 421 421 422 - struct const agp_bridge_driver hp_zx1_driver = { 422 + const struct agp_bridge_driver hp_zx1_driver = { 423 423 .owner = THIS_MODULE, 424 424 .size_type = FIXED_APER_SIZE, 425 425 .configure = hp_zx1_configure,
+1 -1
drivers/char/agp/i460-agp.c
··· 550 550 | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xfffff000) >> 12); 551 551 } 552 552 553 - struct const agp_bridge_driver intel_i460_driver = { 553 + const struct agp_bridge_driver intel_i460_driver = { 554 554 .owner = THIS_MODULE, 555 555 .aperture_sizes = i460_sizes, 556 556 .size_type = U8_APER_SIZE,
+1 -1
drivers/char/agp/sgi-agp.c
··· 247 247 return bridge; 248 248 } 249 249 250 - struct const agp_bridge_driver sgi_tioca_driver = { 250 + const struct agp_bridge_driver sgi_tioca_driver = { 251 251 .owner = THIS_MODULE, 252 252 .size_type = U16_APER_SIZE, 253 253 .configure = sgi_tioca_configure,
+2 -2
drivers/char/agp/uninorth-agp.c
··· 489 489 {4, 1024, 0, 1} 490 490 }; 491 491 492 - struct const agp_bridge_driver uninorth_agp_driver = { 492 + const struct agp_bridge_driver uninorth_agp_driver = { 493 493 .owner = THIS_MODULE, 494 494 .aperture_sizes = (void *)uninorth_sizes, 495 495 .size_type = U32_APER_SIZE, ··· 514 514 .cant_use_aperture = 1, 515 515 }; 516 516 517 - struct const agp_bridge_driver u3_agp_driver = { 517 + const struct agp_bridge_driver u3_agp_driver = { 518 518 .owner = THIS_MODULE, 519 519 .aperture_sizes = (void *)u3_sizes, 520 520 .size_type = U32_APER_SIZE,