diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 23:30:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 23:30:31 -0400 |
commit | 27a24cfa04c6f041c0191847d047f25e5627cd63 (patch) | |
tree | c5377af546f914cc9ca665fd00c825204d61ef35 /include/linux/platform_data | |
parent | 6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5 (diff) | |
parent | b59cc200ac025aca597fb21862c1c9e667f2eff2 (diff) |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fixes from Vinod Koul:
"We have two patches from Andy & Rafael fixing the Lynxpoint dma"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
ACPI / LPSS: register clock device for Lynxpoint DMA properly
dma: acpi-dma: parse CSRT to extract additional resources
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/clk-lpss.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h index 528e73ce46d2..23901992b9dd 100644 --- a/include/linux/platform_data/clk-lpss.h +++ b/include/linux/platform_data/clk-lpss.h | |||
@@ -13,6 +13,11 @@ | |||
13 | #ifndef __CLK_LPSS_H | 13 | #ifndef __CLK_LPSS_H |
14 | #define __CLK_LPSS_H | 14 | #define __CLK_LPSS_H |
15 | 15 | ||
16 | struct lpss_clk_data { | ||
17 | const char *name; | ||
18 | struct clk *clk; | ||
19 | }; | ||
20 | |||
16 | extern int lpt_clk_init(void); | 21 | extern int lpt_clk_init(void); |
17 | 22 | ||
18 | #endif /* __CLK_LPSS_H */ | 23 | #endif /* __CLK_LPSS_H */ |