diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 16:59:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 16:59:44 -0500 |
commit | 8966961b31c251b854169e9886394c2a20f2cea7 (patch) | |
tree | 248a625b23335acbd5ca4b55eb136fe0dc8ba0aa /drivers/staging/vt6656/desc.h | |
parent | 6a5971d8fea1f4a8c33dfe0cec6a1c490f0c9cde (diff) | |
parent | 7bcb57cde66c19df378f3468ea342166a8a4504d (diff) |
Merge tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver tree merge from Greg Kroah-Hartman:
"Here's the big staging tree merge for 3.8-rc1
There's a lot of patches in here, the majority being the comedi
rework/cleanup that has been ongoing and is causing a huge reduction
in overall code size, which is amazing to watch. We also removed some
older drivers (telephony and rts_pstor), and added a new one (fwserial
which also came in through the tty tree due to tty api changes, take
that one if you get merge conflicts.)
The iio and ipack drivers are moving out of the staging area into
their own part of the kernel as they have been cleaned up sufficiently
and are working well.
Overall, again a reduction of code:
768 files changed, 31887 insertions(+), 82166 deletions(-)
All of this has been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1298 commits)
iio: imu: adis16480: remove duplicated include from adis16480.c
iio: gyro: adis16136: remove duplicated include from adis16136.c
iio:imu: adis16480: show_firmware() buffer too small
iio:gyro: adis16136: divide by zero in write_frequency()
iio: adc: Add Texas Instruments ADC081C021/027 support
iio:ad7793: Add support for the ad7796 and ad7797
iio:ad7793: Add support for the ad7798 and ad7799
staging:iio: Move ad7793 driver out of staging
staging:iio:ad7793: Implement stricter id checking
staging:iio:ad7793: Move register definitions from header to source
staging:iio:ad7793: Rework regulator handling
staging:iio:ad7793: Rework platform data
staging:iio:ad7793: Use kstrtol instead of strict_strtol
staging:iio:ad7793: Use usleep_range instead of msleep
staging:iio:ad7793: Fix temperature scale
staging:iio:ad7793: Fix VDD monitor scale
staging: gdm72xx: unlock on error in init_usb()
staging: panel: pass correct lengths to keypad_send_key()
staging: comedi: addi_apci_2032: fix interrupt support
staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()
...
Diffstat (limited to 'drivers/staging/vt6656/desc.h')
-rw-r--r-- | drivers/staging/vt6656/desc.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h index b68b2ec96ea..5007e98d1b0 100644 --- a/drivers/staging/vt6656/desc.h +++ b/drivers/staging/vt6656/desc.h | |||
@@ -298,7 +298,7 @@ typedef const SCTS_FB *PCSCTS_FB; | |||
298 | // Tx FIFO header | 298 | // Tx FIFO header |
299 | // | 299 | // |
300 | typedef struct tagSTxBufHead { | 300 | typedef struct tagSTxBufHead { |
301 | DWORD adwTxKey[4]; | 301 | u32 adwTxKey[4]; |
302 | WORD wFIFOCtl; | 302 | WORD wFIFOCtl; |
303 | WORD wTimeStamp; | 303 | WORD wTimeStamp; |
304 | WORD wFragCtl; | 304 | WORD wFragCtl; |
@@ -376,24 +376,24 @@ typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; | |||
376 | // MICHDR data header | 376 | // MICHDR data header |
377 | // | 377 | // |
378 | typedef struct tagSMICHDRHead { | 378 | typedef struct tagSMICHDRHead { |
379 | DWORD adwHDR0[4]; | 379 | u32 adwHDR0[4]; |
380 | DWORD adwHDR1[4]; | 380 | u32 adwHDR1[4]; |
381 | DWORD adwHDR2[4]; | 381 | u32 adwHDR2[4]; |
382 | } __attribute__ ((__packed__)) | 382 | } __attribute__ ((__packed__)) |
383 | SMICHDRHead, *PSMICHDRHead; | 383 | SMICHDRHead, *PSMICHDRHead; |
384 | 384 | ||
385 | typedef const SMICHDRHead *PCSMICHDRHead; | 385 | typedef const SMICHDRHead *PCSMICHDRHead; |
386 | 386 | ||
387 | typedef struct tagSBEACONCtl { | 387 | typedef struct tagSBEACONCtl { |
388 | DWORD BufReady : 1; | 388 | u32 BufReady:1; |
389 | DWORD TSF : 15; | 389 | u32 TSF:15; |
390 | DWORD BufLen : 11; | 390 | u32 BufLen:11; |
391 | DWORD Reserved : 5; | 391 | u32 Reserved:5; |
392 | } __attribute__ ((__packed__)) | 392 | } __attribute__ ((__packed__)) |
393 | SBEACONCtl; | 393 | SBEACONCtl; |
394 | 394 | ||
395 | typedef struct tagSSecretKey { | 395 | typedef struct tagSSecretKey { |
396 | DWORD dwLowDword; | 396 | u32 dwLowDword; |
397 | BYTE byHighByte; | 397 | BYTE byHighByte; |
398 | } __attribute__ ((__packed__)) | 398 | } __attribute__ ((__packed__)) |
399 | SSecretKey; | 399 | SSecretKey; |
@@ -402,11 +402,11 @@ typedef struct tagSKeyEntry { | |||
402 | BYTE abyAddrHi[2]; | 402 | BYTE abyAddrHi[2]; |
403 | WORD wKCTL; | 403 | WORD wKCTL; |
404 | BYTE abyAddrLo[4]; | 404 | BYTE abyAddrLo[4]; |
405 | DWORD dwKey0[4]; | 405 | u32 dwKey0[4]; |
406 | DWORD dwKey1[4]; | 406 | u32 dwKey1[4]; |
407 | DWORD dwKey2[4]; | 407 | u32 dwKey2[4]; |
408 | DWORD dwKey3[4]; | 408 | u32 dwKey3[4]; |
409 | DWORD dwKey4[4]; | 409 | u32 dwKey4[4]; |
410 | } __attribute__ ((__packed__)) | 410 | } __attribute__ ((__packed__)) |
411 | SKeyEntry; | 411 | SKeyEntry; |
412 | 412 | ||