diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 11:19:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:20 -0700 |
| commit | 541a8bde90068471e9fc26cfe4c5fcb11dcd751b (patch) | |
| tree | f7fc80526318ad4c36239e878e62ea0db3ef7151 /drivers/staging/epl/EplTarget.h | |
| parent | 563b125de36c91722f038f11da374d49de168917 (diff) | |
Staging: epl: remove __KERNEL__ checks
We are in the kernel, so these checks are pointless.
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>
Diffstat (limited to 'drivers/staging/epl/EplTarget.h')
| -rw-r--r-- | drivers/staging/epl/EplTarget.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index 6ee8d515942..0e6da210545 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -83,18 +83,12 @@ // applications needs to use one common library function (e.g. memcpy()). So // you can set (or change) it here. -#ifndef __KERNEL__ -#include <stdlib.h> -#include <stdio.h> -#else -// #include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/errno.h> #include <linux/major.h> #include <linux/version.h> -#endif //29.11.2004 f.j. sonst ist memcpy und memset unbekannt // #include <string.h> @@ -102,13 +96,8 @@ #define EPL_MEMCPY(dst,src,siz) memcpy((void*)(dst),(const void*)(src),(size_t)(siz)); #define EPL_MEMSET(dst,val,siz) memset((void*)(dst),(int)(val),(size_t)(siz)); -#ifndef __KERNEL__ -#define EPL_MALLOC(siz) malloc((size_t)(siz)) -#define EPL_FREE(ptr) free((void *)ptr) -#else #define EPL_MALLOC(siz) kmalloc((size_t)(siz), GFP_KERNEL) #define EPL_FREE(ptr) kfree((void *)ptr) -#endif #ifndef PRINTF0 #define PRINTF TRACE |