diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 17:17:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 17:17:25 +0000 |
| commit | eefc842a6e1de128fbdc9214b9f178a2e238fb7b (patch) | |
| tree | d2ad19ca658d61858eaae521faaf6c6c585caefb | |
| parent | ae696fd53280d85b43ec1dd74f80162bee088862 (diff) | |
[ARM] netx: fix simple clk API
... to only return the framebuffer clock for the framebuffer device.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-netx/fb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c index 24c79650f9f3..8f1f992f002e 100644 --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c @@ -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) |