diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /conf/machine/collie.conf | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'conf/machine/collie.conf')
| -rw-r--r-- | conf/machine/collie.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 47f6e30dfd..66995e9b09 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14" # actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -XSERVER = "xserver-kdrive-fbdev" - MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" |