summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-08-03 21:45:26 +0000
committerThomas Kunze <thommycheck@gmx.de>2008-08-03 21:45:26 +0000
commit5accee758316d43e8235553ec96a8386e98bb936 (patch)
treee76e6e06c4f7434f3e6968198a8ac6471cab5faf /conf/machine
parent153b95adceb7432a7be8551d8f5aeb55407d1e47 (diff)
parent894fcd09757550defb344445597e113bbae02c52 (diff)
merge of '406c90b8a818c97f925962469fd82f2ed13008f4'
and '73fde4da3f327fd96c1de6b88bb8e733e1db530d'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/collie.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 3914184a22..34731c387f 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -21,6 +21,6 @@ ROOT_FLASH_SIZE = "14"
DONT_CHECK_KERNELSIZE ?= "1"
IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt \
- files/device_table_add-mmc.txt"
+ files/device_table-collie.txt"
XSERVER ?= "xserver-kdrive-fbdev"