From 5e6b92fb047e9b770523ab78c9ef86822e19fc46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20B=C3=A9rard?= Date: Fri, 30 Jun 2006 21:31:26 +0000 Subject: [PATCH] Debian fix from Daniel Gimpelevich --- Makefile | 5 +++-- apmemu.c | 2 +- apmemu.h | 2 +- omnibook.h | 28 ++++++++++++++-------------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 739f172..796c11e 100644 --- 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 c8d4b46..c8624e1 100644 --- 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 , 2002-2004 + * Written by Soós Péter , 2002-2004 */ #ifdef OMNIBOOK_STANDALONE diff --git a/apmemu.h b/apmemu.h index 6d3af13..b12cab5 100644 --- 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 , 2002-2004 + * Written by Soós Péter , 2002-2004 */ diff --git a/omnibook.h b/omnibook.h index 9f9d9b5..8d41a5b 100644 --- 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 -- 2.43.5