From: Mathieu Bérard <mathieu.berard@crans.org>
Date: Wed, 9 Aug 2006 21:19:44 +0000 (+0000)
Subject: Add dmi info the the Satellite M100
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=6f7b90c81412f00d349fca5774f7ad4455a0870e;p=omnibook.git

Add dmi info the the Satellite M100
Tentative fix for backlight conditional compilation
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6c3ca4a..bb3c3b0 100644
--- 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 4de6394..b35b275 100644
--- 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 3df0b52..1565545 100644
--- 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 f241eb0..7f8349f 100644
--- 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