diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /drivers/video/ps3fb.c | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'drivers/video/ps3fb.c')
| -rw-r--r-- | drivers/video/ps3fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 87f826e4c95..e00c1dff55d 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
| @@ -1213,7 +1213,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) | |||
| 1213 | dev->core.driver_data = info; | 1213 | dev->core.driver_data = info; |
| 1214 | 1214 | ||
| 1215 | dev_info(info->device, "%s %s, using %u KiB of video memory\n", | 1215 | dev_info(info->device, "%s %s, using %u KiB of video memory\n", |
| 1216 | dev_driver_string(info->dev), info->dev->bus_id, | 1216 | dev_driver_string(info->dev), dev_name(info->dev), |
| 1217 | info->fix.smem_len >> 10); | 1217 | info->fix.smem_len >> 10); |
| 1218 | 1218 | ||
| 1219 | task = kthread_run(ps3fbd, info, DEVICE_NAME); | 1219 | task = kthread_run(ps3fbd, info, DEVICE_NAME); |