diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 17:47:06 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:23:58 -0400 |
commit | 740e518efcd84ce5e53ecf3c4c9be08cf8f3747c (patch) | |
tree | a383e3a2bb4fa724fdd7d6a52424027b2fc881c8 /drivers/video | |
parent | d38b69689c349f35502b92e20dafb30c62d49d63 (diff) |
[PATCH] 64bit resource: C99 changes for struct resource declarations
Based on an original patch from Ralf Baechle <ralf@linux-mips.org> and
Vivek Goyal <vgoyal@in.ibm.com>. This is needed in order to prepare for
changing the size of resources.
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/console/vgacon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index f32b590730f2..01401cd63ac0 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
@@ -390,7 +390,7 @@ static const char *vgacon_startup(void) | |||
390 | vga_video_port_val = VGA_CRT_DM; | 390 | vga_video_port_val = VGA_CRT_DM; |
391 | if ((ORIG_VIDEO_EGA_BX & 0xff) != 0x10) { | 391 | if ((ORIG_VIDEO_EGA_BX & 0xff) != 0x10) { |
392 | static struct resource ega_console_resource = | 392 | static struct resource ega_console_resource = |
393 | { "ega", 0x3B0, 0x3BF }; | 393 | { .name = "ega", .start = 0x3B0, .end = 0x3BF }; |
394 | vga_video_type = VIDEO_TYPE_EGAM; | 394 | vga_video_type = VIDEO_TYPE_EGAM; |
395 | vga_vram_size = 0x8000; | 395 | vga_vram_size = 0x8000; |
396 | display_desc = "EGA+"; | 396 | display_desc = "EGA+"; |
@@ -398,9 +398,9 @@ static const char *vgacon_startup(void) | |||
398 | &ega_console_resource); | 398 | &ega_console_resource); |
399 | } else { | 399 | } else { |
400 | static struct resource mda1_console_resource = | 400 | static struct resource mda1_console_resource = |
401 | { "mda", 0x3B0, 0x3BB }; | 401 | { .name = "mda", .start = 0x3B0, .end = 0x3BB }; |
402 | static struct resource mda2_console_resource = | 402 | static struct resource mda2_console_resource = |
403 | { "mda", 0x3BF, 0x3BF }; | 403 | { .name = "mda", .start = 0x3BF, .end = 0x3BF }; |
404 | vga_video_type = VIDEO_TYPE_MDA; | 404 | vga_video_type = VIDEO_TYPE_MDA; |
405 | vga_vram_size = 0x2000; | 405 | vga_vram_size = 0x2000; |
406 | display_desc = "*MDA"; | 406 | display_desc = "*MDA"; |
@@ -423,14 +423,14 @@ static const char *vgacon_startup(void) | |||
423 | 423 | ||
424 | if (!ORIG_VIDEO_ISVGA) { | 424 | if (!ORIG_VIDEO_ISVGA) { |
425 | static struct resource ega_console_resource | 425 | static struct resource ega_console_resource |
426 | = { "ega", 0x3C0, 0x3DF }; | 426 | = { .name = "ega", .start = 0x3C0, .end = 0x3DF }; |
427 | vga_video_type = VIDEO_TYPE_EGAC; | 427 | vga_video_type = VIDEO_TYPE_EGAC; |
428 | display_desc = "EGA"; | 428 | display_desc = "EGA"; |
429 | request_resource(&ioport_resource, | 429 | request_resource(&ioport_resource, |
430 | &ega_console_resource); | 430 | &ega_console_resource); |
431 | } else { | 431 | } else { |
432 | static struct resource vga_console_resource | 432 | static struct resource vga_console_resource |
433 | = { "vga+", 0x3C0, 0x3DF }; | 433 | = { .name = "vga+", .start = 0x3C0, .end = 0x3DF }; |
434 | vga_video_type = VIDEO_TYPE_VGAC; | 434 | vga_video_type = VIDEO_TYPE_VGAC; |
435 | display_desc = "VGA+"; | 435 | display_desc = "VGA+"; |
436 | request_resource(&ioport_resource, | 436 | request_resource(&ioport_resource, |
@@ -474,7 +474,7 @@ static const char *vgacon_startup(void) | |||
474 | } | 474 | } |
475 | } else { | 475 | } else { |
476 | static struct resource cga_console_resource = | 476 | static struct resource cga_console_resource = |
477 | { "cga", 0x3D4, 0x3D5 }; | 477 | { .name = "cga", .start = 0x3D4, .end = 0x3D5 }; |
478 | vga_video_type = VIDEO_TYPE_CGA; | 478 | vga_video_type = VIDEO_TYPE_CGA; |
479 | vga_vram_size = 0x2000; | 479 | vga_vram_size = 0x2000; |
480 | display_desc = "*CGA"; | 480 | display_desc = "*CGA"; |