diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /drivers/video/amba-clcd.c | |
parent | 58f45e3c6f4fd2b9b9d7d43af71409a79a4b4cf6 (diff) | |
parent | d3144df5bd8eb1c8137cc92989e2e6bc9f2e5a27 (diff) | |
download | lwn-62778396020a29d742abf980c1e83f3df4b5426e.tar.gz lwn-62778396020a29d742abf980c1e83f3df4b5426e.zip |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'drivers/video/amba-clcd.c')
-rw-r--r-- | drivers/video/amba-clcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 5fc983c5b92c..cf03ad067147 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c @@ -447,6 +447,8 @@ static int clcdfb_register(struct clcd_fb *fb) goto out; } + fb->fb.device = &fb->dev->dev; + fb->fb.fix.mmio_start = fb->dev->res.start; fb->fb.fix.mmio_len = resource_size(&fb->dev->res); |