diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /package/xorg-server | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 348a14447..df2ebc314 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -23,7 +23,7 @@ PKG_NEED_CXX:= 1 PKG_OPTS:= dev PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA -PKG_ARCH_DEPENDS:= !cris !avr32 +PKG_ARCH_DEPENDS:= !cris !avr32 !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib |