From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/xf86-input-evdev/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-input-evdev') diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile index b8311198a..fae25b9f6 100644 --- a/package/xf86-input-evdev/Makefile +++ b/package/xf86-input-evdev/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2d3f7111b8284cec81884023c4bb4a11 PKG_DESCR:= X11 driver for Event driver PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server kmod-input-evdev libudev +PKG_DEPENDS:= xorg-server libudev PKG_BUILDDEP:= xorg-server eudev PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3