xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into irq/core

Browse Source 
Get the urgent fixes from upstream to avoid conflicts.
This commit is contained in:
Thomas Gleixner
2015-06-05 22:25:01 +02:00
parent de8d1810fd 086e8ddb56
commit 9f61f62544
692 changed files with 7329 additions and 5450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/platform_data/si5351.h
View File

@@ -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];
};