From: Mathieu Bérard <mathieu.berard@crans.org>
Date: Fri, 11 Aug 2006 14:45:07 +0000 (+0000)
Subject: * omnibook.h: Fix #if define to correctly compile backlight
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=b445069fc7a0dceefba788fe6ad094b1509d547e;p=omnibook.git

* omnibook.h: Fix #if define to correctly compile backlight
  device support if it's enabled in kernel (or as a module)
* Makefile: Include explicit depmod in load target and clean
  Modules.symvers as well as Module.symvers (seems to be kernel
  version dependent)
---

diff --git a/Makefile b/Makefile
index 480affc..b465dfe 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ clean:
 		make -C $(KSRC) M=$(PWD) clean
 		$(RM) *~ "#*#" .swp
 		$(RM) -r debian/omnibook-source *-stamp
-		$(RM) -r Module.symvers
+		$(RM) -r Module.symvers Modules.symvers
 		(cd misc/obtest; $(RM) obtest *.o)
 
 
@@ -77,6 +77,7 @@ unload:
 		$(RMMOD) $(MODULE_NAME) || :
 
 load:		install unload
+		$(DEPMOD)
 		$(INSMOD) $(MODULE_NAME)
 
 uninstall:	unload
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 64cf65c..d4ac393 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -8,7 +8,9 @@ Changelog file for omnibook package:
   the support is pretty minimalistic (LCD brigtness only) this
   also inaugurate ectype 14
 * Cleanup/Fix in Makefile
+  Include explicit depmod in the 'load' target
 * Improvements in the Debian packages by Julien Valroff
+* Fix backlight support conditional compilation
 
 2.20060809 Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M40X (Thanks Julien Valroff) 
diff --git a/omnibook.h b/omnibook.h
index 4a307b5..5b60b82 100644
--- a/omnibook.h
+++ b/omnibook.h
@@ -106,7 +106,7 @@ extern int set_omnibook_param(const char *val, struct kernel_param *kp);
  */
 
 #ifdef  OMNIBOOK_STANDALONE
-#if     defined(CONFIG_BACKLIGHT_DEVICE) && defined(BACKLIGHT_CLASS_DEVICE) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16))
+#if     (defined (CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,16))
 #define CONFIG_OMNIBOOK_BACKLIGHT
 #else
 #undef  CONFIG_OMNIBOOK_BACKLIGHT