diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
| commit | 1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 (patch) | |
| tree | 6bd4915b4289ef32c94ecd523f38bb13ca032e4a /arch/arm/mach-mxs/include/mach/clock.h | |
| parent | 4a683a2c5e7cabe91218db28e56dc25e1b134ce3 (diff) | |
| parent | d8cff1365ec568149d57aeed8279d745591d0fa1 (diff) | |
Merge branch 'fixes'
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/clock.h')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/include/mach/clock.h b/arch/arm/mach-mxs/include/mach/clock.h index 041e276d8a32..592c9ab5d760 100644 --- a/arch/arm/mach-mxs/include/mach/clock.h +++ b/arch/arm/mach-mxs/include/mach/clock.h @@ -29,8 +29,6 @@ struct clk { int id; /* Source clock this clk depends on */ struct clk *parent; - /* Secondary clock to enable/disable with this clock */ - struct clk *secondary; /* Reference count of clock enable/disable */ __s8 usecount; /* Register bit position for clock's enable/disable control. */ |