Merge branch 'master' into for-next
[linux-2.6-block.git] / include / media / lirc.h
1 #include <uapi/linux/lirc.h>