diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2018-01-11 22:01:17 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-01-11 22:03:50 +0200 |
| commit | acc95bc85036c443da8bf7159a77edf9f00dcd80 (patch) | |
| tree | 21965c6e60a2e29664b7685e52feacdb6a86e0bd /chardev/wctablet.c | |
| parent | 880b1ffe6ec2f0ae25cc4175716227ad275e8b8a (diff) | |
| parent | 997eba28a3ed5400a80f754bf3a1c8044b75b9ff (diff) | |
Merge remote-tracking branch 'origin/master' into HEAD
Resolve conflicts around apb.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'chardev/wctablet.c')
| -rw-r--r-- | chardev/wctablet.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chardev/wctablet.c b/chardev/wctablet.c index 6c13c2c58a..969d014574 100644 --- a/chardev/wctablet.c +++ b/chardev/wctablet.c @@ -25,10 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <string.h> -#include <sys/time.h> -#include <time.h> #include "qemu/osdep.h" #include "qemu-common.h" |