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/vt6656/firmware.c | |
| 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/vt6656/firmware.c')
| -rw-r--r-- | drivers/staging/vt6656/firmware.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index ebb9c99..d49ea70 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -773,7 +773,7 @@ FIRMWAREbDownload( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; PBYTE pBuffer = NULL; WORD wLength; int ii; @@ -806,7 +806,7 @@ FIRMWAREbDownload( if (pBuffer) kfree(pBuffer); spin_lock_irq(&pDevice->lock); - return (FALSE); + return FALSE; } } } @@ -823,7 +823,7 @@ FIRMWAREbBrach2Sram( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n"); |
