From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/xf86-video-siliconmotion/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-video-siliconmotion/Makefile') diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index 44097e853..c24d98532 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-siliconmotion PKG_VERSION:= 1.7.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 94c44123d8d0a46a7f6bace8508763d8 -PKG_DESCR:= x11 driver for Silicon Motion VGA chips +PKG_DESCR:= x11 driver for silicon motion vga chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server -- cgit v1.2.3