diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:26:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:28:19 +0200 |
| commit | 5e1249ff36d29653dde09fedf1d04a4ecff028c2 (patch) | |
| tree | 900c8f019139e9be4d4fe403cbe67d4dfd487f92 /include/linux/platform_data | |
| parent | a2ee48d60eed9cfb6447a4233370aee4ea88108b (diff) | |
| parent | fe4c63c8cbd22251f8ce8bcb7853e46385f7af82 (diff) | |
Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
Pull in patches Jani applied while I was on vacation.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/si5351.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/platform_data/si5351.h b/include/linux/platform_data/si5351.h index a947ab8b441a..533d9807e543 100644 --- a/include/linux/platform_data/si5351.h +++ b/include/linux/platform_data/si5351.h @@ -5,8 +5,6 @@ #ifndef __LINUX_PLATFORM_DATA_SI5351_H__ #define __LINUX_PLATFORM_DATA_SI5351_H__ -struct clk; - /** * enum si5351_pll_src - Si5351 pll clock source * @SI5351_PLL_SRC_DEFAULT: default, do not change eeprom config @@ -107,8 +105,6 @@ struct si5351_clkout_config { * @clkout: array of clkout configuration */ struct si5351_platform_data { - struct clk *clk_xtal; - struct clk *clk_clkin; enum si5351_pll_src pll_src[2]; struct si5351_clkout_config clkout[8]; }; |