mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 15:02:43 +02:00
mipsbox/hdmi-cec: fix viral merge error
Origin commit data
------------------
Branch: master
Commit: 19d5dc6aa1
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-02 (Tue, 02 Feb 2021)
Origin message was:
------------------
- mipsbox/hdmi-cec: fix viral merge error
------------------
This commit was generated by Migit
This commit is contained in:
@@ -594,15 +594,9 @@ void hdmi_cec::run()
|
||||
struct epoll_event event;
|
||||
event.data.fd = hdmiFd;
|
||||
event.events = EPOLLIN;
|
||||
<<<<<<< HEAD
|
||||
|
||||
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
|
||||
|
||||
=======
|
||||
|
||||
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
|
||||
|
||||
>>>>>>> e24aae1... cec volume switch audiosystem/tv
|
||||
|
||||
std::array<struct epoll_event, EPOLL_MAX_EVENTS> events;
|
||||
|
||||
while (running)
|
||||
|
Reference in New Issue
Block a user