diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/video/gbefb.c | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/video/gbefb.c')
| -rw-r--r-- | drivers/video/gbefb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index 1a83709f9611..f67db4268374 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
| @@ -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; |