diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/xf86-input-keyboard/Makefile | |
parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/xf86-input-keyboard/Makefile')
-rw-r--r-- | package/xf86-input-keyboard/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index 5ed7240d7..be80953ef 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP+= xorg-server PKG_DEPENDS:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_TARGET_DEPENDS:= alix1c lemote +PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 shuttle include $(TOPDIR)/mk/package.mk |