diff --git a/[refs] b/[refs] index 5491dc97b4a7..e6f9f156c796 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71c3ba9a94c88c43e7216869531c8fbbacd15d9b +refs/heads/master: b5272b509a8570bb559156001e74ee162c5cb96a diff --git a/trunk/include/linux/sh_clk.h b/trunk/include/linux/sh_clk.h index 1636d1e2a5f1..08a07b9a894f 100644 --- a/trunk/include/linux/sh_clk.h +++ b/trunk/include/linux/sh_clk.h @@ -25,6 +25,10 @@ struct clk { int id; struct clk *parent; + struct clk **parent_table; /* list of parents to */ + unsigned short parent_num; /* choose between */ + unsigned char src_shift; /* source clock field in the */ + unsigned char src_width; /* configuration register */ struct clk_ops *ops; struct list_head children;