lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'clks' into devel

Browse Source
This commit is contained in:
Russell King
2008-11-30 17:46:52 +00:00
committed by Russell King
parent 773e9610a7 ee569c43e3
commit 112243034c
13 changed files with 64 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-netx/fb.c
View File

@@ -22,14 +22,11 @@
#include <linux/dma-mapping.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/err.h>
#include <mach/netx-regs.h>
#include <mach/hardware.h>
struct clk {};
static struct clk fb_clk;
static struct clcd_panel *netx_panel;
void netx_clcd_enable(struct clcd_fb *fb)
@@ -85,7 +82,7 @@ int clk_enable(struct clk *clk)
struct clk *clk_get(struct device *dev, const char *id)
{
return &fb_clk;
return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT);
}
void clk_put(struct clk *clk)