diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/ehea/ehea_qmr.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/ehea/ehea_qmr.h')
| -rw-r--r-- | drivers/net/ehea/ehea_qmr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h index 38104734a3be..fddff8ec8cfd 100644 --- a/drivers/net/ehea/ehea_qmr.h +++ b/drivers/net/ehea/ehea_qmr.h | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #ifndef __EHEA_QMR_H__ | 29 | #ifndef __EHEA_QMR_H__ |
| 30 | #define __EHEA_QMR_H__ | 30 | #define __EHEA_QMR_H__ |
| 31 | 31 | ||
| 32 | #include <linux/prefetch.h> | ||
| 32 | #include "ehea.h" | 33 | #include "ehea.h" |
| 33 | #include "ehea_hw.h" | 34 | #include "ehea_hw.h" |
| 34 | 35 | ||