diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/xf86-video-intel/Makefile | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
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 96a8fb784..24add28ac 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server libdrm PKG_BUILDDEP:= xorg-server libdrm PKG_SITES:= ${MASTER_SITE_XORG} -PKG_CFLINE:= y if (ADK_PKG_LAPTOP && ADK_TARGET_SYSTEM_IBM_X40) +PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk |