diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /include/linux/platform_data/edma.h | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'include/linux/platform_data/edma.h')
| -rw-r--r-- | include/linux/platform_data/edma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index 57300fd7cc03..179fb91bb5f2 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h | |||
| @@ -180,4 +180,6 @@ struct edma_soc_info { | |||
| 180 | const s16 (*xbar_chans)[2]; | 180 | const s16 (*xbar_chans)[2]; |
| 181 | }; | 181 | }; |
| 182 | 182 | ||
| 183 | int edma_trigger_channel(unsigned); | ||
| 184 | |||
| 183 | #endif | 185 | #endif |