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/kernel/VirtualEthernet.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/kernel/VirtualEthernet.h')
-rw-r--r-- | drivers/staging/epl/kernel/VirtualEthernet.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/epl/kernel/VirtualEthernet.h b/drivers/staging/epl/kernel/VirtualEthernet.h index deff8720e37f..4a42cce66cac 100644 --- a/drivers/staging/epl/kernel/VirtualEthernet.h +++ b/drivers/staging/epl/kernel/VirtualEthernet.h @@ -73,23 +73,11 @@ #include "EplDllk.h" -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) -tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p); +tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p); -tEplKernel PUBLIC VEthDelInstance(void); +tEplKernel VEthDelInstance(void); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) |