diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-13 14:10:33 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-13 14:10:40 -0300 |
| commit | 6deabdc1bc9698ac40b8822a3f86a599f3fcae60 (patch) | |
| tree | 383c423231a002f0178cb13aff18677b802e4267 /conf/machine/include/mxs-base.inc | |
| parent | 2e51766a36752e2a89e5a96ea6b4db3dc4d34145 (diff) | |
| parent | 749e8333698cae764ccc13a969f24c0942a868c9 (diff) | |
| download | meta-fsl-arm-6deabdc1bc9698ac40b8822a3f86a599f3fcae60.tar.gz | |
Merge remote branch 'freescale/denzil' into master
* freescale/denzil:
mxs-base.inc: Use xserver-xorg instead of xserver-xorg-lite
imx-base.inc: Use xserver-xorg instead of xserver-xorg-lite
fsl-default-providers.inc: Change virtual/xserver to xserver-xorg
imx-base.inc: Remove useless SoC override for U-Boot settings
u-boot: Fix mx28evk bootargs
Diffstat (limited to 'conf/machine/include/mxs-base.inc')
| -rw-r--r-- | conf/machine/include/mxs-base.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc index 1ca84d9..486e914 100644 --- a/conf/machine/include/mxs-base.inc +++ b/conf/machine/include/mxs-base.inc | |||
| @@ -9,7 +9,7 @@ include conf/machine/include/tune-arm926ejs.inc | |||
| 9 | 9 | ||
| 10 | SOC_FAMILY = "mxs" | 10 | SOC_FAMILY = "mxs" |
| 11 | 11 | ||
| 12 | XSERVER = "xserver-xorg-lite \ | 12 | XSERVER = "xserver-xorg \ |
| 13 | xf86-input-evdev \ | 13 | xf86-input-evdev \ |
| 14 | xf86-video-fbdev" | 14 | xf86-video-fbdev" |
| 15 | 15 | ||