diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
| commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
| tree | e4d79479a1280ad4841005680e37119d6694c3bf /drivers/video | |
| parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
| parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) | |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/pxafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index cc59c52e1103..0bc2c5a127b9 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -1429,7 +1429,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) | |||
| 1429 | memset(fbi, 0, sizeof(struct pxafb_info)); | 1429 | memset(fbi, 0, sizeof(struct pxafb_info)); |
| 1430 | fbi->dev = dev; | 1430 | fbi->dev = dev; |
| 1431 | 1431 | ||
| 1432 | fbi->clk = clk_get(dev, "LCDCLK"); | 1432 | fbi->clk = clk_get(dev, NULL); |
| 1433 | if (IS_ERR(fbi->clk)) { | 1433 | if (IS_ERR(fbi->clk)) { |
| 1434 | kfree(fbi); | 1434 | kfree(fbi); |
| 1435 | return NULL; | 1435 | return NULL; |