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/user/EplNmtuCal.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/user/EplNmtuCal.h')
-rw-r--r-- | drivers/staging/epl/user/EplNmtuCal.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index c881582702bb..b9850372a4a6 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h @@ -69,23 +69,12 @@ ****************************************************************************/ -#include "EplNmtu.h" -#include "../kernel/EplNmtk.h" - #ifndef _EPLNMTUCAL_H_ #define _EPLNMTUCAL_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "EplNmtu.h" +#include "../kernel/EplNmtk.h" -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- -EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState(void); +tEplNmtState EplNmtkCalGetNmtState(void); #endif // #ifndef _EPLNMTUCAL_H_ |