diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 15:48:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 15:48:55 -0400 |
commit | c8d1a126924fcbc1d61ceb830226e0c7afdcc841 (patch) | |
tree | d3f3c850481c33b7f433175e83a189f958b1b868 /drivers/staging/vt6656/wcmd.h | |
parent | d7dbf4ffee1c7a17e2e5b5f01efe76fbd1671db6 (diff) | |
parent | 107c161b7ddeeb7da43509cc6b29211885ccd9af (diff) |
Merge staging-next tree into Linus's latest version
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
drivers/staging/wlags49_h2/wl_cs.c
This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/wcmd.h')
-rw-r--r-- | drivers/staging/vt6656/wcmd.h | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h index 90d672b462b..09c4411c689 100644 --- a/drivers/staging/vt6656/wcmd.h +++ b/drivers/staging/vt6656/wcmd.h | |||
@@ -105,46 +105,32 @@ typedef enum tagCMD_STATE { | |||
105 | WLAN_CMD_IDLE | 105 | WLAN_CMD_IDLE |
106 | } CMD_STATE, *PCMD_STATE; | 106 | } CMD_STATE, *PCMD_STATE; |
107 | 107 | ||
108 | |||
109 | |||
110 | /*--------------------- Export Classes ----------------------------*/ | 108 | /*--------------------- Export Classes ----------------------------*/ |
111 | 109 | ||
112 | /*--------------------- Export Variables --------------------------*/ | 110 | /*--------------------- Export Variables --------------------------*/ |
113 | 111 | ||
114 | |||
115 | /*--------------------- Export Types ------------------------------*/ | 112 | /*--------------------- Export Types ------------------------------*/ |
116 | 113 | ||
117 | |||
118 | /*--------------------- Export Functions --------------------------*/ | 114 | /*--------------------- Export Functions --------------------------*/ |
119 | VOID | ||
120 | vResetCommandTimer( | ||
121 | IN HANDLE hDeviceContext | ||
122 | ); | ||
123 | 115 | ||
124 | BOOL | 116 | void vResetCommandTimer(void *hDeviceContext); |
125 | bScheduleCommand( | 117 | |
126 | IN HANDLE hDeviceContext, | 118 | BOOL bScheduleCommand(void *hDeviceContext, |
127 | IN CMD_CODE eCommand, | 119 | CMD_CODE eCommand, |
128 | IN PBYTE pbyItem0 | 120 | PBYTE pbyItem0); |
129 | ); | 121 | |
122 | void vRunCommand(void *hDeviceContext); | ||
130 | 123 | ||
131 | VOID | ||
132 | vRunCommand( | ||
133 | IN HANDLE hDeviceContext | ||
134 | ); | ||
135 | /* | 124 | /* |
136 | VOID | 125 | void |
137 | WCMDvCommandThread( | 126 | WCMDvCommandThread( |
138 | PVOID Context | 127 | void * Context |
139 | ); | 128 | ); |
140 | */ | 129 | */ |
141 | 130 | ||
142 | //2007-0115-09<Add>by MikeLiu | 131 | //2007-0115-09<Add>by MikeLiu |
143 | #ifdef TxInSleep | 132 | #ifdef TxInSleep |
144 | VOID | 133 | void BSSvSecondTxData(void *hDeviceContext); |
145 | BSSvSecondTxData( | ||
146 | IN HANDLE hDeviceContext | ||
147 | ); | ||
148 | #endif | 134 | #endif |
149 | 135 | ||
150 | #endif //__WCMD_H__ | 136 | #endif /* __WCMD_H__ */ |