Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-netx / fb.c

diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index ef0ab6115c0b494f02533716bf214f7f59abd75e..8f1f992f002ee6804e19edf7cfd552a993f2f58d 100644 (file)
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -22,13 +22,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
+#include <linux/err.h>
 
-#include <asm/arch/netx-regs.h>
-#include <asm/hardware.h>
-
-struct clk {};
-
-static struct clk fb_clk;
+#include <mach/netx-regs.h>
+#include <mach/hardware.h>
 
 static struct clcd_panel *netx_panel;
 
@@ -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)