Fixed M40X detection

diff --git a/debian/changelog b/debian/changelog
index a0b85e749a5e65e990fafc19fa48b65691a78e60..56ce0f69bab3ee2e18394cad26747d7fe956d0bd 100644 (file)
--- 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 e495a26e3c4ee642b3c9ad80de633ece351d3556..fe918fadb22fae765599709b8b4bd8dd751fef44 100644 (file)
--- 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 17b274a430c40340f43a5e6ecd82e3ab11758ccf..a63506fef55fb1b981d935ff38137fe4e0f88963 100644 (file)
--- 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 0d809489f54716b18adbb13cc016f5de77ce8041..fbfd6f65239226f1c7179555363cdd30e1bd02bd 100644 (file)
--- 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