diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 15:15:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 15:15:41 +0000 |
| commit | d8cff1365ec568149d57aeed8279d745591d0fa1 (patch) | |
| tree | f2fc8d808c77037512861e57c4b69d6d4edbfb95 /arch/arm/mach-mxs/include | |
| parent | 7c289385b84d136089b8a1149321ebffa5193595 (diff) | |
| parent | 014aaf6b15842eec03162c0026ec533b4b738126 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -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 041e276d8a3..592c9ab5d76 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. */ |