summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-06-06 23:22:00 +0200
committerDirk von Suchodoletz2009-06-06 23:22:00 +0200
commit4fcac596cf7e9876cde8a37c4d21c53bf35d053e (patch)
treeefefe5f63aa21337003cc3673a2fa8f022a4d750 /kernel
parentCompilation quickfix for DNBD kernel module (to be checked if proper (diff)
downloaddnbd-master.tar.gz
dnbd-master.tar.xz
dnbd-master.zip
Reverting r2926 as it did not make sense in other setups ...HEADmaster
git-svn-id: http://svn.openslx.org/svn/openslx/contrib/dnbd/trunk@2942 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dnbd.h7
-rw-r--r--kernel/net.h7
-rw-r--r--kernel/queue.h7
3 files changed, 3 insertions, 18 deletions
diff --git a/kernel/dnbd.h b/kernel/dnbd.h
index 1cac03b..a744038 100644
--- a/kernel/dnbd.h
+++ b/kernel/dnbd.h
@@ -1,14 +1,9 @@
#ifndef LINUX_DNBD_H
#define LINUX_DNBD_H 1
-#include <linux/version.h>
#include <linux/completion.h>
#include <linux/in.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
- #include <asm/semaphore.h>
-#else
- #include <linux/semaphore.h>
-#endif
+#include <linux/semaphore.h>
#include <linux/blkdev.h>
#include <linux/rbtree.h>
#include <linux/jiffies.h>
diff --git a/kernel/net.h b/kernel/net.h
index 989f430..8fad623 100644
--- a/kernel/net.h
+++ b/kernel/net.h
@@ -1,13 +1,8 @@
#ifndef LINUX_DNBD_NET_H
#define LINUX_DNBD_NET_H 1
-#include <linux/version.h>
#include <linux/spinlock.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
- #include <asm/semaphore.h>
-#else
- #include <linux/semaphore.h>
-#endif
+#include <linux/semaphore.h>
#include <linux/list.h>
#include <linux/param.h>
#include <linux/jiffies.h>
diff --git a/kernel/queue.h b/kernel/queue.h
index 4a5e653..287965b 100644
--- a/kernel/queue.h
+++ b/kernel/queue.h
@@ -1,13 +1,8 @@
#ifndef LINUX_DNBD_QUEUE_H
#define LINUX_DNBD_QUEUE_H 1
-#include <linux/version.h>
#include <linux/spinlock.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
- #include <asm/semaphore.h>
-#else
- #include <linux/semaphore.h>
-#endif
+#include <linux/semaphore.h>
#include <linux/list.h>
#include <linux/wait.h>