From: Julien Valroff <julien@kirya.net>
Date: Thu, 17 Aug 2006 09:56:20 +0000 (+0000)
Subject: Fixed M40X detection
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=6f75bb875a18a211f9071d176abecdf7014f913a;p=omnibook.git

Fixed M40X detection
---

diff --git a/debian/changelog b/debian/changelog
index a0b85e7..56ce0f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ omnibook (2:2.20060809-3) unstable; urgency=low
     + 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)
   * Uses dh_installmodules for maintainance scripts
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e495a26..fe918fa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,7 @@
 Changelog file for omnibook package:
 ------------------------------------
 
-2.XXXXXXXX
+2.20060816
 
 2.20060816 Mathieu Bérard <math_b@users.sourceforge.net>
 * Merge from the new-backend branch: Add new backend code 
diff --git a/laptop.h b/laptop.h
index 17b274a..a63506f 100644
--- a/laptop.h
+++ b/laptop.h
@@ -599,21 +599,21 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
 
 	{
 		.callback = dmi_matched,
-		.ident = "Toshiba Satellite M40",
+		.ident = "Toshiba Satellite M40X",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40X"),
 		},
-		.driver_data = (void*) TSM40
+			.driver_data = (void*) TSM30X
 	},
 	{
 		.callback = dmi_matched,
-		.ident = "Toshiba Satellite M40X",
+		.ident = "Toshiba Satellite M40",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40X"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M40"),
 		},
-			.driver_data = (void*) TSM30X
+		.driver_data = (void*) TSM40
 	},
 	{
 		.callback = dmi_matched,
diff --git a/omnibook.h b/omnibook.h
index 0d80948..fbfd6f6 100644
--- a/omnibook.h
+++ b/omnibook.h
@@ -26,7 +26,7 @@
  */
 
 #define OMNIBOOK_MODULE_NAME		"omnibook"
-#define OMNIBOOK_MODULE_VERSION		"2.20000000"
+#define OMNIBOOK_MODULE_VERSION		"2.20060816"
 
 /*
  * EC types