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/xf86-video-intel/Makefile | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'package/xf86-video-intel/Makefile')
| -rw-r--r-- | package/xf86-video-intel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index cc9fcecd6..cf5e34215 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !arm !avr32 +PKG_ARCH_DEPENDS:= !arm !avr32 !m68k PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk |