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/pcmciautils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pcmciautils/Makefile') diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile index 1cec54440..25294278b 100644 --- a/package/pcmciautils/Makefile +++ b/package/pcmciautils/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= pcmciautils PKG_VERSION:= 018 PKG_RELEASE:= 1 PKG_MD5SUM:= 3c388cb559975b37a75cb5965e9800a9 -PKG_DESCR:= Utilities for PCMCIA subsystem -PKG_SECTION:= utils +PKG_DESCR:= utilities for pcmcia subsystem +PKG_SECTION:= sys/utils PKG_BUILDDEP:= sysfsutils bison-host flex-host PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ -- cgit v1.2.3