summaryrefslogtreecommitdiff
path: root/drivers/edac/edac_core.h
diff options
context:
space:
mode:
authorDouglas Thompson <dougthompson@xmission.com>2007-07-19 01:50:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 10:04:54 -0700
commit86aa8cb7bc47fe786df073246055d69d98e6330a (patch)
tree391f85de03e0deeb44aa73f62633cc750a4cf609 /drivers/edac/edac_core.h
parent542b25881a6ae1bf0804d4d39bf8b4d2cfc25e42 (diff)
drivers/edac: cleanup workq ifdefs
The origin of this code comes from patches at sourceforge, that allow EDAC to be updated to various kernels. With kernel version 2.6.20 a new workq system was installed, thus the patches needed to be modified based on the kernel version. For submitting to the latest kernel.org those #ifdefs are removed Signed-off-by: Douglas Thompson <dougthompson@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac/edac_core.h')
-rw-r--r--drivers/edac/edac_core.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index c511ad4de901..b955c58672e2 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -395,11 +395,8 @@ struct mem_ctl_info {
struct completion kobj_complete;
/* work struct for this MC */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
struct delayed_work work;
-#else
- struct work_struct work;
-#endif
+
/* the internal state of this controller instance */
int op_state;
};
@@ -530,11 +527,7 @@ struct edac_device_ctl_info {
/* the internal state of this controller instance */
int op_state;
/* work struct for this instance */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
struct delayed_work work;
-#else
- struct work_struct work;
-#endif
/* pointer to edac polling checking routine:
* If NOT NULL: points to polling check routine
@@ -647,11 +640,7 @@ struct edac_pci_ctl_info {
/* the internal state of this controller instance */
int op_state;
/* work struct for this instance */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
struct delayed_work work;
-#else
- struct work_struct work;
-#endif
/* pointer to edac polling checking routine:
* If NOT NULL: points to polling check routine