diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-15 10:55:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-15 10:55:50 -0800 |
| commit | 6960d46a88477c1a8404d225a21331131c5113c2 (patch) | |
| tree | f43f5a1a37ae05bb4c9cd9a6abda3c0f2bc52f84 /drivers | |
| parent | 72533b77d30c2be02672e26b5dde1263d7b4c2be (diff) | |
| parent | 83ae20981ae924c37d02a42c829155fc3851260c (diff) | |
| download | linux-6960d46a88477c1a8404d225a21331131c5113c2.tar.gz linux-6960d46a88477c1a8404d225a21331131c5113c2.tar.bz2 linux-6960d46a88477c1a8404d225a21331131c5113c2.zip | |
Merge tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo:
It's the second batch of fixes for 3.8, which includes one fixing for
!CONFIG_SMP build, two patches fixing broken imxfb driver caused by
multiplatform conversion, and a couple of pm/hotplug fixes.
* tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: correct low-power mode setting
ARM: imx: disable cpu in .cpu_kill hook
video: imxfb: fix imxfb_info configuration order
ARM: imx: platform-imx-fb: modifies platform device name
ARM: imx: fix build error with !CONFIG_SMP
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/imxfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index e501dbc966b3..8435c5d601a1 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -729,6 +729,8 @@ static int __init imxfb_init_fbinfo(struct platform_device *pdev) memset(fbi, 0, sizeof(struct imxfb_info)); + fbi->devtype = pdev->id_entry->driver_data; + strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id)); info->fix.type = FB_TYPE_PACKED_PIXELS; @@ -789,7 +791,6 @@ static int __init imxfb_probe(struct platform_device *pdev) return -ENOMEM; fbi = info->par; - fbi->devtype = pdev->id_entry->driver_data; if (!fb_mode) fb_mode = pdata->mode[0].mode.name; |