diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 13:07:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:22 -0700 |
| commit | b3491294994bf9d2b86d400132416ac95ef6b33a (patch) | |
| tree | e5b2c4c6339e5f0d6e70254b0dbed7808d3278e9 | |
| parent | 01f5e0322d5e04049f0b1fb5d747d088dec45241 (diff) | |
Staging: epl: remove kernel version checks
They are no longer needed now that we are in the kernel.
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/epl/Edrv8139.c | 6 | ||||
| -rw-r--r-- | drivers/staging/epl/EplApiLinuxKernel.c | 18 | ||||
| -rw-r--r-- | drivers/staging/epl/EplTarget.h | 1 | ||||
| -rw-r--r-- | drivers/staging/epl/VirtualEthernetLinux.c | 1 | ||||
| -rw-r--r-- | drivers/staging/epl/proc_fs.c | 1 |
5 files changed, 0 insertions, 27 deletions
diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index c0709a5836f..44e3f7b144b 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -81,7 +81,6 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/major.h> -#include <linux/version.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/atomic.h> @@ -751,12 +750,7 @@ void EdrvInterruptHandler(void) } #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p) -#else -static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, - struct pt_regs *ptRegs_p) -#endif { // EdrvInterruptHandler(); tEdrvRxBuffer RxBuffer; diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index a994b16d849..5a2d066e60e 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -72,9 +72,6 @@ // kernel modul and driver -//#include <linux/version.h> -//#include <linux/config.h> - #include <linux/module.h> #include <linux/fs.h> #include <linux/cdev.h> @@ -102,15 +99,6 @@ //#include "kernel/EplPdokCal.h" #include "proc_fs.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - // remove ("make invisible") obsolete symbols for kernel versions 2.6 - // and higher -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT -#define EXPORT_NO_SYMBOLS -#else -#error "This driver needs a 2.6.x kernel or higher" -#endif /***************************************************************************/ /* */ @@ -226,8 +214,6 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, struct file *pInstance_p, // Kernel Module specific Data Structures //--------------------------------------------------------------------------- -EXPORT_NO_SYMBOLS; - module_init(EplLinInit); module_exit(EplLinExit); @@ -416,8 +402,6 @@ static int EplLinOpen(struct inode *pDeviceFile_p, // information about the devi TRACE0("EPL: + EplLinOpen...\n"); - MOD_INC_USE_COUNT; - if (uiEplState_g != EPL_STATE_NOTOPEN) { // stack already initialized iRet = -EALREADY; } else { @@ -490,8 +474,6 @@ static int EplLinRelease(struct inode *pDeviceFile_p, // information about the d uiEplState_g = EPL_STATE_NOTOPEN; iRet = 0; - MOD_DEC_USE_COUNT; - TRACE1("EPL: - EplLinRelease (iRet=%d)\n", iRet); return (iRet); diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index beacd89c3d6..e76d21ff9d9 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -88,7 +88,6 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/major.h> -#include <linux/version.h> //29.11.2004 f.j. sonst ist memcpy und memset unbekannt // #include <string.h> diff --git a/drivers/staging/epl/VirtualEthernetLinux.c b/drivers/staging/epl/VirtualEthernetLinux.c index 445b9e620c2..21206c4d22f 100644 --- a/drivers/staging/epl/VirtualEthernetLinux.c +++ b/drivers/staging/epl/VirtualEthernetLinux.c @@ -74,7 +74,6 @@ ****************************************************************************/ -#include <linux/version.h> #include <linux/module.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index e82ab0c0b56..739d3899353 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -83,7 +83,6 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/major.h> -#include <linux/version.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/atomic.h> |