History

Merge branch 'linus' into irq/core

Get the urgent fixes from upstream to avoid conflicts.

Thomas Gleixner committed 11 years ago

Commit 9f61f622 parents de8d181 086e8dd692 files · +7323 −5444Browse files

Showing the changes to include/linux/platform_data (1 of 692 files). Show all

Unified · Split

include/linux/platform_data/si5351.h+0−4
@@ -5,8 +5,6 @@ · 4 unmodified lines
5#ifndef __LINUX_PLATFORM_DATA_SI5351_H__5#ifndef __LINUX_PLATFORM_DATA_SI5351_H__
6#define __LINUX_PLATFORM_DATA_SI5351_H__6#define __LINUX_PLATFORM_DATA_SI5351_H__
7 7
8struct clk;
9
10/**8/**
11 * enum si5351_pll_src - Si5351 pll clock source9 * enum si5351_pll_src - Si5351 pll clock source
12 * @SI5351_PLL_SRC_DEFAULT: default, do not change eeprom config10 * @SI5351_PLL_SRC_DEFAULT: default, do not change eeprom config
@@ -107,8 +105,6 @@ struct si5351_clkout_config { · 94 unmodified lines
107 * @clkout: array of clkout configuration105 * @clkout: array of clkout configuration
108 */106 */
109struct si5351_platform_data {107struct si5351_platform_data {
110 struct clk *clk_xtal;
111 struct clk *clk_clkin;
112 enum si5351_pll_src pll_src[2];108 enum si5351_pll_src pll_src[2];
113 struct si5351_clkout_config clkout[8];109 struct si5351_clkout_config clkout[8];
114};110};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t