Add dmi info the the Satellite M100

Tentative fix for backlight conditional compilation

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6c3ca4a084b2e14972e90b74b1892ae6e2bafd17..bb3c3b076686b7708c8423e66a1264df9f09d3a1 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,9 @@
 Changelog file for omnibook package:
 ------------------------------------
 
+2.XXXXXXXX Mathieu Bérard <math_b@users.sourceforge.net>
+* Add dmi info for Toshiba Satellite M100 (Thanks Sertaç Ö. Yıldız)
+
 2.20060809 Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M40X (Thanks Julien Valroff) 
 * Fix two brown paper bag bugs in Debian/Ubuntu support 

diff --git a/laptop.h b/laptop.h
index 4de6394d0c95f4c8f00fc0ee142fc21769bace9f..b35b2755aa1a0ba48c21728129e4b3d6b5621207 100644 (file)
--- a/laptop.h
+++ b/laptop.h
@@ -578,7 +578,6 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                 },
                 .driver_data = (void*) TSM30X
         },
-
        {
                .callback = dmi_matched,
                .ident = "Toshiba Satellite M70",
@@ -588,6 +587,16 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                },
                .driver_data = (void*) TSM30X
        },
+        {
+                .callback = dmi_matched,
+                .ident = "Toshiba Satellite M100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M100"),
+                },
+                .driver_data = (void*) TSM30X
+        },
+
        {
                .callback = dmi_matched,
                .ident = "Toshiba Satellite M40",

diff --git a/misc/dmi_strings.txt b/misc/dmi_strings.txt
index 3df0b52be689e7ed1df0ffd59b00ee23eae8fc5c..156554573752699058004ea14af63031da92a655 100644 (file)
--- a/misc/dmi_strings.txt
+++ b/misc/dmi_strings.txt
@@ -233,6 +233,20 @@ Board Vendor:      TOSHIBA
 Board Name:    HTW00
 Board Version: Null
 
+---------------------------------------------
+Toshiba Satellite M100 ----------------------
+
+BIOS Vendor:    TOSHIBA
+BIOS Version:   V1.90
+BIOS Release:   07/20/2006
+System Vendor:  TOSHIBA
+Product Name:   Satellite M100
+Version:        PSMA0E-030019TE
+Serial Number:  46795329G
+Board Vendor:   TOSHIBA
+Board Name:     HAQAA
+Board Version:  Null
+
 ---------------------------------------------
 Compal ACL00 --------------------------------
 

diff --git a/omnibook.h b/omnibook.h
index f241eb06ee24f257e1f7e4318ebb62f83b8f3c62..7f8349f13eb9441f67cac5bd717489fbc5e493e1 100644 (file)
--- a/omnibook.h
+++ b/omnibook.h
@@ -46,7 +46,7 @@ extern int omnibook_ectype;
 #define        XE2     256     /* 9  HP OmniBook XE2 */
 #define        AMILOD  512     /* 10 Fujitsu Amilo D */
 #define        TSP10   1024    /* 11 Toshiba Satellite P10, P15, P20 and compatible */
-#define        TSM30X  2048    /* 12 Toshiba Satellite M30X, M35X, M70 and compatible */
+#define        TSM30X  2048    /* 12 Toshiba Satellite M30X, M35X, M40X, M70 and compatible */
 #define        TSM40   4096    /* 13 Toshiba Satellite M40 */
 
 /*
@@ -105,7 +105,7 @@ extern int set_omnibook_param(const char *val, struct kernel_param *kp);
  */
 
 #ifdef  OMNIBOOK_STANDALONE
-#if     defined(CONFIG_BACKLIGHT_DEVICE) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16))
+#if     defined(CONFIG_BACKLIGHT_DEVICE) && defined(BACKLIGHT_CLASS_DEVICE) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16))
 #define CONFIG_OMNIBOOK_BACKLIGHT
 #else
 #undef  CONFIG_OMNIBOOK_BACKLIGHT