Debian fix from Daniel Gimpelevich

diff --git a/Makefile b/Makefile
index 739f172393337d6edd6010fba62ed6f6c2825aaa..796c11eca1c97521b6761add4fbedabd770bf64b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@ ifeq ($(KERNELRELEASE),)
 
 DESTDIR        = 
 MODDIR = $(DESTDIR)/lib/modules
-KVER   = $(shell uname -r)
+KVERS  = $(shell uname -r)
+KVER   = $(KVERS)
 VMODDIR = $(MODDIR)/$(KVER)
 INSTDIR        = $(VMODDIR)/kernel/drivers/misc/omnibook
 #KSRC  = /usr/src/linux
@@ -30,7 +31,7 @@ KINCDIR       = $(KSRC)/include/linux
 KDOCDIR        = $(KSRC)/Documentation/omnibook
 BDIR   = $(shell pwd)
 TODAY  = $(shell date +%Y%m%d)
-KERNEL = $(shell uname -r | cut -c 1-3)
+KERNEL = $(shell echo $(KVER) | cut -d . -f 1-2)
 
 DEPMOD = depmod -a
 RMMOD  = modprobe -r

diff --git a/apmemu.c b/apmemu.c
index c8d4b462056598fa351feedcd010464c497cdacc..c8624e17fa6a58730f3f9209a5e9427235ec0c44 100644 (file)
--- a/apmemu.c
+++ b/apmemu.c
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * Written by Soós Péter <sp@osb.hu>, 2002-2004
+ * Written by Soós Péter <sp@osb.hu>, 2002-2004
  */
 
 #ifdef OMNIBOOK_STANDALONE

diff --git a/apmemu.h b/apmemu.h
index 6d3af130ff7973234f543935666e370739d3cfa2..b12cab5d314eabd72d7f08b4bd0d555113ce9b14 100644 (file)
--- a/apmemu.h
+++ b/apmemu.h
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * Written by Soós Péter <sp@osb.hu>, 2002-2004
+ * Written by Soós Péter <sp@osb.hu>, 2002-2004
  */
 
 

diff --git a/omnibook.h b/omnibook.h
index 9f9d9b5d7303a16e7e32aa0a9b34e2dfa1234aeb..8d41a5bb4d2462c92a256b5560da92da15fe7770 100644 (file)
--- a/omnibook.h
+++ b/omnibook.h
@@ -34,20 +34,20 @@
 extern int omnibook_ectype;
 
 
-#define        NONE    0       /* Default/unknown EC type */
-#define        XE3GF   1       /* HP OmniBook XE3 GF, most Toshiba Satellites and more */
-#define        XE3GC   2       /* HP OmniBook XE3 GC, GD, GE and compatible */
-#define        OB500   4       /* HP OmniBook 500 and compatible */
-#define        OB510   8       /* HP OmniBook 510 */
-#define        OB6000  16      /* HP OmniBook 6000 */
-#define        OB6100  32      /* HP OmniBook 6100 */
-#define        XE4500  64      /* HP OmniBook xe4500 and compatible */
-#define        OB4150  128     /* HP OmniBook 4150 */
-#define        XE2     256     /* HP OmniBook XE2 */
-#define        AMILOD  512     /* Fujitsu Amilo D */
-#define        TSP10   1024    /* Toshiba Satellite P10, P15, P20 and compatible */
-#define        TSM30X  2048    /* Toshiba Satellite M30X, M35X, M70 and compatible */
-#define        TSM40   4096    /* Toshiba Satellite M40 */
+#define        NONE    0       /* 0  Default/unknown EC type */ 
+#define        XE3GF   1       /* 1  HP OmniBook XE3 GF, most Toshiba Satellites and more */
+#define        XE3GC   2       /* 2  HP OmniBook XE3 GC, GD, GE and compatible */
+#define        OB500   4       /* 3  HP OmniBook 500 and compatible */
+#define        OB510   8       /* 4  HP OmniBook 510 */
+#define        OB6000  16      /* 5  HP OmniBook 6000 */
+#define        OB6100  32      /* 6  HP OmniBook 6100 */
+#define        XE4500  64      /* 7  HP OmniBook xe4500 and compatible */
+#define        OB4150  128     /* 8  HP OmniBook 4150 */
+#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        TSM40   4096    /* 13 Toshiba Satellite M40 */
 
 /*
  * This represent a feature provided by this module