diff options
| author |   James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/staging/epl/Benchmark.h | |
| parent | integrity: remove __setup auditing msgs (diff) | |
| parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
| download | linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.zip | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/epl/Benchmark.h')
| -rw-r--r-- | drivers/staging/epl/Benchmark.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/epl/Benchmark.h b/drivers/staging/epl/Benchmark.h index 62dee3b14373..4cc01bd12a1a 100644 --- a/drivers/staging/epl/Benchmark.h +++ b/drivers/staging/epl/Benchmark.h @@ -73,12 +73,6 @@ #include "global.h" -#if (TARGET_SYSTEM == _NO_OS_) && (DEV_SYSTEM == _DEV_GNU_CF548X_) -#include "common.h" - -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) - -// #include <linux/config.h> #include <linux/kernel.h> #ifdef CONFIG_COLDFIRE @@ -93,12 +87,6 @@ #define BENCHMARK_MODULES 0x00000000 #endif -#else - // disable Benchmarking -#undef BENCHMARK_MODULES -#define BENCHMARK_MODULES 0x00000000 -#endif - /***************************************************************************/ /* */ /* */ |