diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /include/media/ir-rx51.h | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | kernel_goldelico_gta04-c362495586e8a3a6487a318fcd82eaf15ffe2142.zip kernel_goldelico_gta04-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.gz kernel_goldelico_gta04-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.bz2 | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/media/ir-rx51.h')
| -rw-r--r-- | include/media/ir-rx51.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/media/ir-rx51.h b/include/media/ir-rx51.h new file mode 100644 index 0000000..104aa89 --- /dev/null +++ b/include/media/ir-rx51.h @@ -0,0 +1,10 @@ +#ifndef _LIRC_RX51_H +#define _LIRC_RX51_H + +struct lirc_rx51_platform_data { + int pwm_timer; + + int(*set_max_mpu_wakeup_lat)(struct device *dev, long t); +}; + +#endif |