diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/winbond/wbhal_f.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbhal_f.h')
-rw-r--r-- | drivers/staging/winbond/wbhal_f.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h index 401c024..fc78c14 100644 --- a/drivers/staging/winbond/wbhal_f.h +++ b/drivers/staging/winbond/wbhal_f.h @@ -78,14 +78,4 @@ u32 hal_get_bss_pk_cnt(struct hw_data *hw_data); #define hal_get_time_count(_P) (_P->time_count / 10) #define hal_detect_error(_P) (_P->WbUsb.DetectCount) -/* The follow function is unused for IS89C35 */ -#define hal_disable_interrupt(_A) -#define hal_enable_interrupt(_A) -#define hal_get_interrupt_type(_A) -#define hal_get_clear_interrupt(_A) #define hal_ibss_disconnect(_A) (hal_stop_sync_bss(_A)) -#define hal_join_request_stop(_A) -#define hw_get_cxx_reg(_A, _B, _C) -#define hw_set_cxx_reg(_A, _B, _C) - - |