From: Julien Valroff <julien@kirya.net>
Date: Sat, 12 Aug 2006 09:57:22 +0000 (+0000)
Subject: Fix Toshiba Satellite M40X detection string
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=563301d9533fbe6749182d82fa6d88ff759f758c;p=omnibook.git

Fix Toshiba Satellite M40X detection string
---

diff --git a/debian/changelog b/debian/changelog
index e3a57a0..367c7e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-omnibook (2:2.20060809-3) UNRELEASED; urgency=low
+omnibook (2:2.20060809-3) unstable; urgency=low
 
   * UNRELEASED
   * New upstream release:
     + Changed default location to extra/
     + Support for new Toshiba Satellite models (M100, A105)
+    + Fixed Toshiba Satellite M40X detection string
   * [01_makfefile.dpatch] Removed - fixed upstream
   * Changed defaut STEM value to linux (follows kernel-package)
 
- -- Julien Valroff <julien@kirya.net>  Fri, 11 Aug 2006 09:15:27 +0200
+ -- Julien Valroff <julien@kirya.net>  Sat, 12 Aug 2006 11:56:39 +0200
 
 omnibook (2:2.20060809-2) unstable; urgency=low
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d4ac393..df44390 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -11,6 +11,7 @@ Changelog file for omnibook package:
   Include explicit depmod in the 'load' target
 * Improvements in the Debian packages by Julien Valroff
 * Fix backlight support conditional compilation
+* Fix Toshiba Satellite M40X detection string
 
 2.20060809 Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M40X (Thanks Julien Valroff) 
diff --git a/laptop.h b/laptop.h
index 4d25893..17b274a 100644
--- a/laptop.h
+++ b/laptop.h
@@ -578,15 +578,6 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
 		},
 		.driver_data = (void*) TSM30X
 	},
-        {
-                .callback = dmi_matched,
-                .ident = "Toshiba Satellite M40X",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40X"),
-                },
-                .driver_data = (void*) TSM30X
-        },
 	{
 		.callback = dmi_matched,
 		.ident = "Toshiba Satellite M70",
@@ -615,6 +606,15 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
 		},
 		.driver_data = (void*) TSM40
 	},
+	{
+		.callback = dmi_matched,
+		.ident = "Toshiba Satellite M40X",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40X"),
+		},
+			.driver_data = (void*) TSM30X
+	},
 	{
 		.callback = dmi_matched,
 		.ident = "Compal ACL00",