diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-12 07:18:04 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-12 07:18:04 (GMT) |
| commit | 8473054e4d2581282230d01d1ae5379cdcf7a4df (patch) | |
| tree | 4606408a26ebd621ff799ffbc6f07126f7fba6b4 /arch/arm/mach-sa1100/generic.h | |
| parent | b49f6ab951113cd2263a9d72b420e725e1cbfcf4 (diff) | |
| parent | 9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff) | |
| download | linux-8473054e4d2581282230d01d1ae5379cdcf7a4df.tar.xz | |
Merge 4.8-rc6 into staging-next
We need the IIO changes in here for future patches to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 0d92e11..68199b603 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h @@ -44,3 +44,5 @@ int sa11x0_pm_init(void); #else static inline int sa11x0_pm_init(void) { return 0; } #endif + +int sa11xx_clk_init(void); |