diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /drivers/video/mbx/mbxfb.c | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/mbx/mbxfb.c')
| -rw-r--r-- | drivers/video/mbx/mbxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c index 80cd117ca65c..01f77bcc68f9 100644 --- a/drivers/video/mbx/mbxfb.c +++ b/drivers/video/mbx/mbxfb.c | |||
| @@ -889,7 +889,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev) | |||
| 889 | struct mbxfb_info *mfbi; | 889 | struct mbxfb_info *mfbi; |
| 890 | struct mbxfb_platform_data *pdata; | 890 | struct mbxfb_platform_data *pdata; |
| 891 | 891 | ||
| 892 | dev_dbg(dev, "mbxfb_probe\n"); | 892 | dev_dbg(&dev->dev, "mbxfb_probe\n"); |
| 893 | 893 | ||
| 894 | pdata = dev->dev.platform_data; | 894 | pdata = dev->dev.platform_data; |
| 895 | if (!pdata) { | 895 | if (!pdata) { |