diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/vt6656/control.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/control.c')
| -rw-r--r-- | drivers/staging/vt6656/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c index 8aab6718ff47..5d8c5719419b 100644 --- a/drivers/staging/vt6656/control.c +++ b/drivers/staging/vt6656/control.c @@ -72,7 +72,7 @@ void ControlvWriteByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs, void ControlvReadByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs, PBYTE pbyData) { - NTSTATUS ntStatus; + int ntStatus; BYTE byData1; ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ, |