diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
commit | e61ea24100067bdcd82be23607500d1acbcc91cb (patch) | |
tree | 55433c486ae43889b43179a076624097e029ffb9 /meta-moblin | |
parent | 3e7b691f60630bd224ab95374ddb5f3c108f645e (diff) | |
parent | f21745fa921c1eacb9740ba4f08813a54be4ab8d (diff) | |
download | poky-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz |
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta-moblin')
-rw-r--r-- | meta-moblin/conf/machine/netbook.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-moblin/conf/machine/netbook.conf b/meta-moblin/conf/machine/netbook.conf index 12f9af7bdf..e227018041 100644 --- a/meta-moblin/conf/machine/netbook.conf +++ b/meta-moblin/conf/machine/netbook.conf | |||
@@ -21,7 +21,7 @@ XSERVER ?= "xserver-xf86-dri-lite \ | |||
21 | xf86-input-mouse \ | 21 | xf86-input-mouse \ |
22 | xf86-input-keyboard \ | 22 | xf86-input-keyboard \ |
23 | xf86-input-synaptics \ | 23 | xf86-input-synaptics \ |
24 | xf86-video-intel" | 24 | xf86-video-intel-dri2" |
25 | MACHINE_DRI_MODULES = "i915" | 25 | MACHINE_DRI_MODULES = "i915" |
26 | 26 | ||
27 | MACHINE_EXTRA_RDEPENDS = "rt2860" | 27 | MACHINE_EXTRA_RDEPENDS = "rt2860" |