summaryrefslogtreecommitdiff
path: root/conf/machine/guinness.conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-10-16 14:35:49 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-10-16 14:35:49 +0000
commit7905194bf3b24e9d1f805e5539549c99b08f3e70 (patch)
tree305efa573f1a53d9eebd8cea85c5424de860cc06 /conf/machine/guinness.conf
parent2ee602ad04a5d5edfbe1e80486ecbe43785668b4 (diff)
parent03356f0b58aae756f4e45a505252a549cfb17af5 (diff)
merge of '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'
and '748258dba4c326c803882128fbda7609d96e2709'
Diffstat (limited to 'conf/machine/guinness.conf')
-rw-r--r--conf/machine/guinness.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 12143edf63..4890f3cecd 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -19,5 +19,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
MACHINE_FEATURES = "kernel26 usbhost ext2 pci"
-require conf/machine/include/tune-athlonmp.conf
+#require conf/machine/include/tune-athlonmp.conf