Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2010-07-14 21:11:38 (GMT)
committer Chris Ball <cjb@laptop.org>2010-07-14 21:11:38 (GMT)
commitb256e0e3aceb98fe7d779327dcdf3e01687cb9e9 (patch)
tree6289e4c9c4a123f82fb3dde8212a940f0ad8bc18 /examples
parentd0bfed22418f8301e4ad9f12adea632ee1a58776 (diff)
parentfac40137ab294972a48859549849e5c970b770c8 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/olpc-os-builder
(Conflict with powerd config.)
Diffstat (limited to 'examples')
-rw-r--r--examples/f11-xo1.ini5
-rw-r--r--examples/olpc-os-10.1.2-xo1.ini1
2 files changed, 0 insertions, 6 deletions
diff --git a/examples/f11-xo1.ini b/examples/f11-xo1.ini
index 710a3c3..8f5a61c 100644
--- a/examples/f11-xo1.ini
+++ b/examples/f11-xo1.ini
@@ -26,8 +26,3 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
[sugar_activity_group]
url=http://wiki.laptop.org/go/Activities/G1G1Lite
-[powerd]
-; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
-; with wifi after resume, and the resume delay is a little too noticable.
-enable_idle_suspend=0
-
diff --git a/examples/olpc-os-10.1.2-xo1.ini b/examples/olpc-os-10.1.2-xo1.ini
index b7c062c..0a977fd 100644
--- a/examples/olpc-os-10.1.2-xo1.ini
+++ b/examples/olpc-os-10.1.2-xo1.ini
@@ -39,4 +39,3 @@ url=http://wiki.laptop.org/go/Activities/G1G1Lite
[powerd]
enable_idle_suspend=1
-