hal: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Wed May 23 10:16:05 PDT 2007
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
New commits:
diff-tree 2c52f1eb30d72910dbf26f2b7d01852295994389 (from 0bf91810a2e904ec0e4ff9df5d7a68b390e1b731)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 23 13:16:08 2007 -0400
merge two samsung entries which were independent before
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 659010d..9294183 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -48,14 +48,6 @@
</match>
</match>
</device>
- <device>
- <match key="system.hardware.vendor" string="Samsung">
- <match key="system.hardware.product" string="SQ10">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- </match>
- </device>
<!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
<device>
<match key="system.hardware.vendor" prefix="VIA">
@@ -70,6 +62,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="SQ10">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
</match>
</device>
More information about the hal-commit
mailing list