summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-02-14 00:32:53 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-02-14 00:32:53 +0000
commitec79a06bd56046ad03a95319bf31669eff4fc130 (patch)
tree198b16a994a92e8a39afed132d4f59528ac64fe5 /conf/machine
parentad8af9b7951ed766eb1c6b5f9548fb130a5f024c (diff)
parent7cf673f2ad7f68c52e79e06db1fd304577104737 (diff)
merge of '3ee7753352acbc0627f1b877b1ba96587f656224'
and 'bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/davinci-sffsdr.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index ecff6fae13..faf86c5ed0 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
#ROOT_FLASH_SIZE = "29"
-MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+MACHINE_FEATURES = "kernel26 serial"
require conf/machine/include/tune-arm926ejs.inc