Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / arch / arm / mach-msm / clock.h

diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
index 8d302c7403a82a8b517f18796dfc7e37bd8280a4..2c007f606d2921e61d8692bd7a3e288cf08d588b 100644 (file)
--- a/arch/arm/mach-msm/clock.h
+++ b/arch/arm/mach-msm/clock.h
@@ -51,11 +51,9 @@ struct clk {
        uint32_t remote_id;
        uint32_t count;
        uint32_t flags;
-       const char *name;
        struct clk_ops *ops;
        const char *dbg_name;
        struct list_head list;
-       struct device *dev;
 };
 
 #define OFF CLKFLAG_AUTO_OFF