diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 18:06:45 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 18:06:45 (GMT) |
| commit | 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb (patch) | |
| tree | c54a5fc916cbe73e43dee20902642f367f44a551 /drivers/staging/epl/EplEvent.h | |
| parent | 714f83d5d9f7c785f622259dad1f4fad12d64664 (diff) | |
| parent | ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 (diff) | |
| download | linux-fsl-qoriq-3516c6a8dc0b1153c611c4cf0dc4a51631f052bb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
Diffstat (limited to 'drivers/staging/epl/EplEvent.h')
| -rw-r--r-- | drivers/staging/epl/EplEvent.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h index b6dc1b9..910bd69 100644 --- a/drivers/staging/epl/EplEvent.h +++ b/drivers/staging/epl/EplEvent.h @@ -248,8 +248,8 @@ typedef struct { tEplEventSource m_EventSource; // module which posted this error event tEplKernel m_EplError; // EPL error which occured union { - BYTE m_bArg; - DWORD m_dwArg; + u8 m_bArg; + u32 m_dwArg; tEplEventSource m_EventSource; // from Eventk/u module (originating error source) tEplEventObdError m_ObdError; // from Obd module // tEplErrHistoryEntry m_HistoryEntry; // from Nmtk/u module @@ -267,10 +267,10 @@ typedef struct { } tEplErrorHandlerkEvent; // callback function to get informed about sync event -typedef tEplKernel(PUBLIC * tEplSyncCb) (void); +typedef tEplKernel(*tEplSyncCb) (void); // callback function for generic events -typedef tEplKernel(PUBLIC * tEplProcessEventCb) (tEplEvent * pEplEvent_p); +typedef tEplKernel(*tEplProcessEventCb) (tEplEvent *pEplEvent_p); //--------------------------------------------------------------------------- // function prototypes |