diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
| commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
| tree | df2373bb1119468873c667624769455c36dc3786 /device/dev_master.h | |
| parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
| parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'device/dev_master.h')
| -rw-r--r-- | device/dev_master.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/device/dev_master.h b/device/dev_master.h index 964ae828..70d4c63f 100644 --- a/device/dev_master.h +++ b/device/dev_master.h @@ -30,11 +30,14 @@ * Bind an IO operation to the master CPU. */ +#ifndef _DEVICE_DEV_MASTER_H_ +#define _DEVICE_DEV_MASTER_H_ + #include <cpus.h> #if NCPUS > 1 -#include <kern/macro_help.h> +#include <kern/macros.h> #include <kern/cpu_number.h> #include <kern/sched_prim.h> #include <kern/thread.h> @@ -58,3 +61,5 @@ #define io_release_master() #endif NCPUS > 1 + +#endif /* _DEVICE_DEV_MASTER_H_ */ |