diff options
Diffstat (limited to 'drivers/video/gbefb.c')
-rw-r--r-- | drivers/video/gbefb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index 1a83709f9611..695fa013fe7e 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
@@ -701,7 +701,7 @@ static int gbefb_set_par(struct fb_info *info) | |||
701 | blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit, | 701 | blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit, |
702 | 16bit and 32 bit modes (64 kB). They cover the screen with partial | 702 | 16bit and 32 bit modes (64 kB). They cover the screen with partial |
703 | tiles on the right and/or bottom of the screen if needed. | 703 | tiles on the right and/or bottom of the screen if needed. |
704 | For exemple in 640x480 8 bit mode the mapping is: | 704 | For example in 640x480 8 bit mode the mapping is: |
705 | 705 | ||
706 | <-------- 640 -----> | 706 | <-------- 640 -----> |
707 | <---- 512 ----><128|384 offscreen> | 707 | <---- 512 ----><128|384 offscreen> |
@@ -1147,7 +1147,7 @@ static int __init gbefb_probe(struct platform_device *p_dev) | |||
1147 | gbefb_setup(options); | 1147 | gbefb_setup(options); |
1148 | #endif | 1148 | #endif |
1149 | 1149 | ||
1150 | if (!request_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) { | 1150 | if (!request_mem_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) { |
1151 | printk(KERN_ERR "gbefb: couldn't reserve mmio region\n"); | 1151 | printk(KERN_ERR "gbefb: couldn't reserve mmio region\n"); |
1152 | ret = -EBUSY; | 1152 | ret = -EBUSY; |
1153 | goto out_release_framebuffer; | 1153 | goto out_release_framebuffer; |