From f096afd10ffbc3847c081f2e6e915382a382bec7 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 30 Nov 2008 17:17:25 +0000
Subject: [PATCH] --- yaml --- r: 123615 b: refs/heads/master c:
 eefc842a6e1de128fbdc9214b9f178a2e238fb7b h: refs/heads/master i:   123613:
 39d6227f1b660902b9a14cb10645d3955f538809   123611:
 afc1865a19eafe360d6beb1719b794b100fba859   123607:
 da015b359c829c59b9ad40c6b49ffc43a218df79   123599:
 462c64c8cf533bde0c22d28ce72debec634e023f   123583:
 ce04e3de2a23b81236c2b190cf54de8a27fa09c9 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-netx/fb.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe9245ad1119..b10ef80d9d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae696fd53280d85b43ec1dd74f80162bee088862
+refs/heads/master: eefc842a6e1de128fbdc9214b9f178a2e238fb7b
diff --git a/trunk/arch/arm/mach-netx/fb.c b/trunk/arch/arm/mach-netx/fb.c
index 24c79650f9f3..8f1f992f002e 100644
--- a/trunk/arch/arm/mach-netx/fb.c
+++ b/trunk/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)