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/EdrvSim.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/EdrvSim.h')
-rw-r--r-- | drivers/staging/epl/EdrvSim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/epl/EdrvSim.h b/drivers/staging/epl/EdrvSim.h index 39300e321d6c..191ec1457d26 100644 --- a/drivers/staging/epl/EdrvSim.h +++ b/drivers/staging/epl/EdrvSim.h @@ -83,7 +83,7 @@ // function prototypes //--------------------------------------------------------------------------- -void EdrvRxInterruptHandler(BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, - WORD wDataLen_p); +void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p, + u16 wDataLen_p); #endif // #ifndef _EDRVSIM_H_ |